Merge branch 'master' into contact_dialog

[situare] / src / ui / panelcommon.h

diff --git a/src/ui/panelcommon.h b/src/ui/panelcommon.h
index ccafaa3..d721628 100644 (file)
--- a/src/ui/panelcommon.h
+++ b/src/ui/panelcommon.h
@@ -38,22 +38,22 @@ const int MAEMO5_SCROLLBAR_WIDTH = 8; ///< Width of the Maemo scrollbar
 const int PANEL_TOP_PADDING = 0;    ///< Amount of padding in top of panels
 const int PANEL_BOTTOM_PADDING = 0; ///< Amount of padding in bottom of panels
 
-const int PANEL_BAR_WIDTH = 5;                                          ///< Width of the slider bar
-const int PANEL_TAB_WIDTH = 74;                                         ///< Panel tab (maximum) width
-const int PANEL_BAR_TABBED_WIDTH = PANEL_BAR_WIDTH + PANEL_TAB_WIDTH;   ///< Width of the tabbed bar
-const int PANEL_WIDTH  = 384;                                           ///< Width of the panel
+const int PANEL_BAR_WIDTH = 5;                                              ///< Width of the slider bar
+const int PANEL_TAB_BAR_WIDTH = 74;                                         ///< Panel tab bar total width
+const int PANEL_BAR_TABBED_WIDTH = PANEL_BAR_WIDTH + PANEL_TAB_BAR_WIDTH;   ///< Width of the tabbed bar
+const int PANEL_WIDTH  = 384;                                               ///< Width of the panel
 const int PANEL_HEIGHT = DEFAULT_SCREEN_HEIGHT - PANEL_TOP_PADDING
-                         - PANEL_BOTTOM_PADDING;                        ///< Height of the panel
+                         - PANEL_BOTTOM_PADDING;                            ///< Height of the panel
 
 const int PANEL_MARGIN_LEFT = MAEMO5_SCROLLBAR_WIDTH; ///< Panel inner margin (left)
 const int PANEL_MARGIN_RIGHT = 0;                     ///< Panel inner margin (right)
 const int PANEL_MARGIN_TOP = 0;                       ///< Panel inner margin (top)
 const int PANEL_MARGIN_BOTTOM = 0;                    ///< Panel inner margin (bottom)
 
-const int PANEL_CLOSED_X = DEFAULT_SCREEN_WIDTH - PANEL_TAB_WIDTH
+const int PANEL_CLOSED_X = DEFAULT_SCREEN_WIDTH - PANEL_TAB_BAR_WIDTH
                                  - PANEL_BAR_WIDTH; ///< Horizontal position of a closed panel
 
-const int PANEL_OPENED_X = DEFAULT_SCREEN_WIDTH - PANEL_TAB_WIDTH - PANEL_BAR_WIDTH
+const int PANEL_OPENED_X = DEFAULT_SCREEN_WIDTH - PANEL_TAB_BAR_WIDTH - PANEL_BAR_WIDTH
                                  - PANEL_WIDTH;     ///< Horizontal position of a open panel
 
 // Zoom button panel settings