rnd-19990109-3

[rocksndiamonds.git] / src / buttons.c

diff --git a/src/buttons.c b/src/buttons.c
index bdac86700da292ff60ac2c0e7c3bb515d572cd74..8df941b28f2f98edaa631cd8433b46e639959cd6 100644 (file)
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -1985,8 +1985,6 @@ void AdjustScrollbar(struct GadgetInfo *gi, int items_max, int item_pos)
   if (gs->item_position == gs->items_max - gs->items_visible)
     gs->position = gs->position_max;
 
-  printf("gs->item_position == %d\n", gs->item_position);
-
   if (gi->mapped)
     DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 }
@@ -2014,8 +2012,8 @@ static struct GadgetInfo *last_gi = NULL;
 void HandleGadgets(int mx, int my, int button)
 {
   static unsigned long pressed_delay = 0;
-  static last_button = 0;
-  static last_mx = 0, last_my = 0;
+  static int last_button = 0;
+  static int last_mx = 0, last_my = 0;
   int scrollbar_mouse_pos;
   struct GadgetInfo *new_gi, *gi;
   boolean press_event;
@@ -2166,8 +2164,6 @@ void HandleGadgets(int mx, int my, int button)
        {
          gi->event.item_position = gs->item_position;
          changed_position = TRUE;
-
-         printf("gs->item_position == %d\n", gs->item_position);
        }
 
        AdjustScrollbar(gi, gs->items_max, gs->item_position);
@@ -2238,13 +2234,14 @@ void HandleGadgets(int mx, int my, int button)
       {
        gi->event.item_position = gs->item_position;
        changed_position = TRUE;
-
-       printf("gs->item_position == %d\n", gs->item_position);
       }
 
       DrawGadget(gi, DG_PRESSED, DG_DIRECT);
     }
 
+    if (gi->type == GD_TYPE_DRAWING_AREA)
+      changed_position = TRUE;
+
     gi->state = (gadget_moving_inside || gi->type & GD_TYPE_SCROLLBAR ?
                 GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED);
     gi->event.type = GD_EVENT_MOVING;