X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=6f2426752cf19529aee2ca23e9203426e8d5bdaa;hb=23b0b755ea93f3a1ef44a3e1a4de579836e9cda8;hp=5473ef68a8316193a0c8d792557d9a33a1a82e19;hpb=db6f077754043bf94cf6a18ced0c0191744a1487;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 5473ef68..6f242675 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -922,7 +922,7 @@
 #define ED_MODE_PROPERTIES_CHANGE	ED_TEXTBUTTON_ID_PROPERTIES_CHANGE
 
 /* how many steps can be cancelled */
-#define NUM_UNDO_STEPS			(10 + 1)
+#define NUM_UNDO_STEPS			(64 + 1)
 
 /* values for elements with score for certain actions */
 #define MIN_SCORE			0
@@ -1047,7 +1047,7 @@ static struct
   {
     IMG_EDITOR_BUTTON_GFX_UNDO,			GADGET_ID_UNDO,
     &editor.button.undo,			GD_TYPE_NORMAL_BUTTON,
-    "undo/redo last operation",			'U'
+    "undo/redo last operation",			'u'
   },
   {
     IMG_EDITOR_BUTTON_GFX_CONF,			GADGET_ID_INFO,
@@ -10985,6 +10985,10 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
     case ED_COUNTER_ID_LEVEL_YSIZE:
       lev_fieldx = level.fieldx;
       lev_fieldy = level.fieldy;
+
+      /* check if resizing of level results in change of border border */
+      SetBorderElement();
+
       break;
 
     default:
@@ -11829,11 +11833,13 @@ void HandleLevelEditorKeyInput(Key key)
       ClickOnGadget(level_editor_gadget[GADGET_ID_PROPERTIES], button);
     else if (letter == '.')
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
-    else if (letter == 'R')
+    else if (letter == 'U')
       ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
-    else if (letter == '0')
+    else if (key == KSYM_KP_Subtract)
+      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
+    else if (key == KSYM_KP_0 || letter == '0')
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
-    else if (letter == '+')
+    else if (key == KSYM_KP_Add || letter == '+')
       ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
     else if (key == KSYM_Return ||
 	     key == KSYM_space ||
@@ -11907,7 +11913,7 @@ void PrintEditorGadgetInfoText(struct GadgetInfo *gi)
       else if (gi->custom_id == GADGET_ID_TEST)
 	sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
       else if (gi->custom_id == GADGET_ID_UNDO)
-	sprintf(shortcut, " ('Shift-%c/R')", key);
+	sprintf(shortcut, " ('%c/Shift-U')", key);
       else if (gi->custom_id == GADGET_ID_ZOOM)
 	sprintf(shortcut, " ('%c', '0', '+')", key);
       else