X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=561508dc6aea38bf12520d85fb3fc2e609fa4d86;hb=24101bdeee0ac963cfd48b5220f6d9b0188a6f69;hp=86adfc6f288f6e003acf1721bf750fba1a867087;hpb=bc76bd63993e350f699d1420ebd9ae3ac573f407;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 86adfc6f..561508dc 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1026,7 +1026,7 @@ static struct
     NULL,				" ", "height",
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(6),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(5),
     0,					999,
     GADGET_ID_LEVEL_GEMSLIMIT_DOWN,	GADGET_ID_LEVEL_GEMSLIMIT_UP,
     GADGET_ID_LEVEL_GEMSLIMIT_TEXT,	GADGET_ID_NONE,
@@ -1034,7 +1034,7 @@ static struct
     NULL, "number of gems to collect:",	NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(8),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(7),
     0,					9999,
     GADGET_ID_LEVEL_TIMELIMIT_DOWN,	GADGET_ID_LEVEL_TIMELIMIT_UP,
     GADGET_ID_LEVEL_TIMELIMIT_TEXT,	GADGET_ID_NONE,
@@ -1042,7 +1042,7 @@ static struct
     "time or step limit to solve level:", NULL, NULL
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(10),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(9),
     0,					255,
     GADGET_ID_LEVEL_TIMESCORE_DOWN,	GADGET_ID_LEVEL_TIMESCORE_UP,
     GADGET_ID_LEVEL_TIMESCORE_TEXT,	GADGET_ID_NONE,
@@ -2003,7 +2003,7 @@ static struct
   /* ---------- level and editor settings ---------------------------------- */
 
   {
-    -1,					ED_LEVEL_SETTINGS_YPOS(8),
+    -1,					ED_LEVEL_SETTINGS_YPOS(7),
     GADGET_ID_TIME_OR_STEPS,		GADGET_ID_LEVEL_TIMELIMIT_UP,
     -1,
     options_time_or_steps,
@@ -2011,7 +2011,7 @@ static struct
     NULL, "(0 => no limit)",		"time or step limit"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(5),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(11),
     GADGET_ID_GAME_ENGINE_TYPE,		GADGET_ID_NONE,
     -1,
     options_game_engine_type,
@@ -2019,7 +2019,7 @@ static struct
     "game engine:", NULL,		"game engine"
   },
   {
-    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(12),
+    ED_LEVEL_SETTINGS_XPOS(0),		ED_LEVEL_SETTINGS_YPOS(10),
     GADGET_ID_WIND_DIRECTION,		GADGET_ID_NONE,
     -1,
     options_wind_direction,
@@ -2402,6 +2402,8 @@ static struct
   int gd_x, gd_y;
   int x, y;
   int width, height;
+  int wheel_x, wheel_y;
+  int wheel_width, wheel_height;
   int type;
   int gadget_id;
   char *infotext;
@@ -2411,6 +2413,8 @@ static struct
     ED_SCROLLBAR_XPOS,			ED_SCROLLBAR_YPOS,
     SX + ED_SCROLL_HORIZONTAL_XPOS,	SY + ED_SCROLL_HORIZONTAL_YPOS,
     ED_SCROLL_HORIZONTAL_XSIZE,		ED_SCROLL_HORIZONTAL_YSIZE,
+    0,					0,
+    SX + SXSIZE + SX,			WIN_YSIZE,
     GD_TYPE_SCROLLBAR_HORIZONTAL,
     GADGET_ID_SCROLL_HORIZONTAL,
     "scroll level editing area horizontally"
@@ -2419,6 +2423,8 @@ static struct
     ED_SCROLLBAR_XPOS,			ED_SCROLLBAR_YPOS,
     SX + ED_SCROLL_VERTICAL_XPOS,	SY + ED_SCROLL_VERTICAL_YPOS,
     ED_SCROLL_VERTICAL_XSIZE,		ED_SCROLL_VERTICAL_YSIZE,
+    0,					0,
+    SX + SXSIZE + SX,			WIN_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
     GADGET_ID_SCROLL_VERTICAL,
     "scroll level editing area vertically"
@@ -2427,6 +2433,8 @@ static struct
     ED_SCROLLBAR2_XPOS,			ED_SCROLLBAR2_YPOS,
     DX + ED_SCROLL2_VERTICAL_XPOS,	DY + ED_SCROLL2_VERTICAL_YPOS,
     ED_SCROLL2_VERTICAL_XSIZE,		ED_SCROLL2_VERTICAL_YSIZE,
+    SX + SXSIZE + SX,			0,
+    WIN_XSIZE - (SX + SXSIZE + SX),	WIN_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
     GADGET_ID_SCROLL_LIST_VERTICAL,
     "scroll element list vertically"
@@ -6140,6 +6148,10 @@ static void CreateScrollbarGadgets()
 		      GDI_SCROLLBAR_ITEMS_MAX, items_max,
 		      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
 		      GDI_SCROLLBAR_ITEM_POSITION, item_position,
+		      GDI_WHEEL_AREA_X, scrollbar_info[i].wheel_x,
+		      GDI_WHEEL_AREA_Y, scrollbar_info[i].wheel_y,
+		      GDI_WHEEL_AREA_WIDTH, scrollbar_info[i].wheel_width,
+		      GDI_WHEEL_AREA_HEIGHT, scrollbar_info[i].wheel_height,
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
 		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
@@ -10455,8 +10467,12 @@ void HandleLevelEditorKeyInput(Key key)
 
       case KSYM_Insert:
       case KSYM_Delete:
-#if 1
-	/* IS_EDITOR_CASCADE */
+
+	/* this is needed to prevent interference with running "True X-Mouse" */
+	if (GetKeyModStateFromEvents() & KMOD_Control)
+	  break;
+
+	/* check for last or next editor cascade block in element list */
 	for (i = 0; i < num_editor_elements; i++)
 	{
 	  if ((key == KSYM_Insert && i == element_shift) ||
@@ -10480,36 +10496,6 @@ void HandleLevelEditorKeyInput(Key key)
 
 	ModifyEditorElementList();
 
-#else
-
-	for (i = 0; i < num_editor_elements; i++)
-	{
-	  int e = editor_elements[i];
-
-	  if ((key == KSYM_Insert &&
-	       (e == EL_INTERNAL_CASCADE_CE ||
-		e == EL_INTERNAL_CASCADE_CE_ACTIVE)) ||
-	      (key == KSYM_Delete &&
-	       (e == EL_INTERNAL_CASCADE_GE ||
-		e == EL_INTERNAL_CASCADE_GE_ACTIVE)))
-	    break;
-	}
-
-	if (i < num_editor_elements)
-	{
-	  element_shift = i;
-
-	  if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
-	    element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
-
-	  ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-		       GDI_SCROLLBAR_ITEM_POSITION,
-		       element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
-
-	  ModifyEditorElementList();
-	}
-#endif
-
 	break;
 
       case KSYM_Escape:
@@ -10530,6 +10516,7 @@ void HandleLevelEditorKeyInput(Key key)
 	  DrawDrawingWindow();
 	  edit_mode = ED_MODE_DRAWING;
 	}
+
         break;
 
       default: