projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
135e42a
)
fixed (swapped) editor zoom directions for '-' and '+' (keypad) keys
author
Holger Schemel
<info@artsoft.org>
Thu, 19 Mar 2015 19:24:56 +0000
(20:24 +0100)
committer
Holger Schemel
<info@artsoft.org>
Thu, 19 Mar 2015 19:24:56 +0000
(20:24 +0100)
ChangeLog
patch
|
blob
|
history
src/editor.c
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 55531b8bb939eccf3d13cfe4020f0b9bb2d60812..ce7fc2c00d77d0cb2c3c272847848fe51ec385dd 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,6
@@
+2015-03-19
+ * fixed (swapped) editor zoom directions for '-' and '+' (keypad) keys
+
2015-03-18
* added dynamically configurable graphics and layout of editor gadgets
2015-03-18
* added dynamically configurable graphics and layout of editor gadgets
diff --git
a/src/editor.c
b/src/editor.c
index 091bbd7c4faa47fc49e933fd4193846773a1f554..4a6e9dd40b89bcbac935369d246b00ac2324d766 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1055,7
+1055,7
@@
static struct
{
IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL, GADGET_ID_ZOOM,
&editor.button.zoom_level, GD_TYPE_NORMAL_BUTTON,
{
IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL, GADGET_ID_ZOOM,
&editor.button.zoom_level, GD_TYPE_NORMAL_BUTTON,
- "zoom level tile size", '
-
'
+ "zoom level tile size", '
+
'
},
{
IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT,
},
{
IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT,
@@
-11987,12
+11987,12
@@
void HandleLevelEditorKeyInput(Key key)
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
else if (letter == 'U')
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
else if (letter == 'U')
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
- else if (key == KSYM_KP_Subtract)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
1
);
+ else if (key == KSYM_KP_Subtract
|| letter == '-'
)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
3
);
else if (key == KSYM_KP_0 || letter == '0')
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
else if (key == KSYM_KP_0 || letter == '0')
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
- else if (key == KSYM_KP_Add
|| letter == '+'
)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
3
);
+ else if (key == KSYM_KP_Add)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
1
);
else if (key == KSYM_Return ||
key == KSYM_space ||
key == setup.shortcut.toggle_pause)
else if (key == KSYM_Return ||
key == KSYM_space ||
key == setup.shortcut.toggle_pause)