From cb6c9ba9c25e4f265ea34a540e10e6735fbf6a99 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 3 Mar 2021 13:16:46 +0100 Subject: Simplify cGeometryManager - Initiate osdLeft, osdTop, osdWidth and osdHeight with 0 in cGeometryManager::cGeometryManager(). - cGeometryManager::GeometryChanged(void) is renamed to cGeometryManager::SetOSDSize(void) and merged to set osdLeft, osdTop, osdWidth and osdHeight to cOsd::*. The cache is now created via cNopacity::SetOSDSize(void) when the skin is started for the first time or when the geometry is changed. All SetDisplay*() were merged and moved to cGeometryManager::SetGeometry. So we can delete then all unnecessary funktions. --- geometrymanager.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'geometrymanager.h') diff --git a/geometrymanager.h b/geometrymanager.h index 7db9084..08fce75 100644 --- a/geometrymanager.h +++ b/geometrymanager.h @@ -7,18 +7,11 @@ enum eBackgroundStyle {bsTrans = 0, bsFull}; class cGeometryManager { private: - void SetOSDSize(void); - void SetDisplayMenuSizes(void); - void SetDisplayChannelSizes(void); - void SetDisplayReplaySizes(void); - void SetDisplayMessageSizes(void); - void SetDisplayTrackSizes(void); - void SetDisplayVolumeSizes(void); public: cGeometryManager(); ~cGeometryManager(); + bool SetOSDSize(void); void SetGeometry(void); - bool GeometryChanged(void); int osdWidth; int osdHeight; int osdLeft; -- cgit v1.2.3