fixed some initialization bugs for scrollbars and main screen buttons

diff --git a/ChangeLog b/ChangeLog
index 35d438e21fcc7f172c396d21869bd1bf13be3454..332ee32d628a81f1c89f96f3e050772c4dcfee72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2014-10-20
        * fixed using buttons on main screen with size other than 32x32 pixels
+       * fixed some initialization bugs for scrollbars and main screen buttons
 
 2014-10-17
        * removed some remaining unused X11 stuff

diff --git a/src/conftime.h b/src/conftime.h
index a8916dbc632d38f9b2f77e420701996d80b9d528..44d3b231de9425f997f7fca11398ce1a2a1ea4bb 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-10-20 23:13"
+#define COMPILE_DATE_STRING "2014-10-21 00:38"

diff --git a/src/screens.c b/src/screens.c
index ae35cda2e225c8b999e98111604d95207978218f..9f679ac4e2125778244d5c6fa9d30c8d4afb4ec2 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -961,10 +961,8 @@ static void InitializeMainControls()
 
     if (pos_button != NULL)            /* (x/y may be -1/-1 here) */
     {
-      if (pos_button->width == 0)
-       pos_button->width = button_width;
-      if (pos_button->height == 0)
-       pos_button->height = button_height;
+      pos_button->width  = button_width;
+      pos_button->height = button_height;
     }
 
     if (pos_text != NULL)              /* (x/y may be -1/-1 here) */
@@ -6569,8 +6567,8 @@ static void CreateScreenScrollbuttons()
     height = SC_SCROLLBUTTON_YSIZE;
 
     /* correct scrollbar position if placed outside menu (playfield) area */
-    if (x > SC_SCROLL_UP_XPOS)
-      x = SC_SCROLL_UP_XPOS;
+    if (x > SX + SC_SCROLL_UP_XPOS)
+      x = SX + SC_SCROLL_UP_XPOS;
 
     if (id == SCREEN_CTRL_ID_SCROLL_DOWN)
       y = mSY + (SC_SCROLL_VERTICAL_YPOS +
@@ -6638,8 +6636,8 @@ static void CreateScreenScrollbars()
     height = scrollbar_info[i].height;
 
     /* correct scrollbar position if placed outside menu (playfield) area */
-    if (x > SC_SCROLL_VERTICAL_XPOS)
-      x = SC_SCROLL_VERTICAL_XPOS;
+    if (x > SX + SC_SCROLL_VERTICAL_XPOS)
+      x = SX + SC_SCROLL_VERTICAL_XPOS;
 
     if (id == SCREEN_CTRL_ID_SCROLL_VERTICAL)
       height = (NUM_MENU_ENTRIES_ON_SCREEN - 2) * SC_SCROLLBUTTON_YSIZE;