dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: clean up gimp_controller_keyboard,wheel_scroll() 

to not use two nested if()s, and always return the result of
gimp_controller_event() when an event matches.
This commit is contained in:
Michael Natterer 2016-11-22 19:43:51 +01:00
parent 3e85121eb9
commit fb1dcd0239
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/widgets/gimpcontrollerkeyboard.c
View File

@ -40,11 +40,11 @@ typedef struct _KeyboardEvent KeyboardEvent;
struct _KeyboardEvent
{
const guint keyval;
const gchar *modifier_string;
GdkModifierType modifiers;
const gchar *name;
const gchar *blurb;
const guint keyval;
const gchar *modifier_string;
GdkModifierType modifiers;
const gchar *name;
const gchar *blurb;
};
@ -272,26 +272,21 @@ gimp_controller_keyboard_key_press (GimpControllerKeyboard *keyboard,
*/
for (i = G_N_ELEMENTS (keyboard_events) - 1; i >= 0; i--)
{
if (keyboard_events[i].keyval == kevent->keyval)
if (keyboard_events[i].keyval == kevent->keyval &&
(keyboard_events[i].modifiers & kevent->state) ==
keyboard_events[i].modifiers)
{
if ((keyboard_events[i].modifiers & kevent->state) ==
keyboard_events[i].modifiers)
{
GimpControllerEvent controller_event;
GimpControllerEventTrigger *trigger;
GimpControllerEvent controller_event;
GimpControllerEventTrigger *trigger;
trigger = (GimpControllerEventTrigger *) &controller_event;
trigger = (GimpControllerEventTrigger *) &controller_event;
trigger->type = GIMP_CONTROLLER_EVENT_TRIGGER;
trigger->source = GIMP_CONTROLLER (keyboard);
trigger->event_id = i;
trigger->type = GIMP_CONTROLLER_EVENT_TRIGGER;
trigger->source = GIMP_CONTROLLER (keyboard);
trigger->event_id = i;
if (gimp_controller_event (GIMP_CONTROLLER (keyboard),
&controller_event))
{
return TRUE;
}
}
return gimp_controller_event (GIMP_CONTROLLER (keyboard),
&controller_event);
}
}

24
app/widgets/gimpcontrollerwheel.c
View File

@ -271,23 +271,21 @@ gimp_controller_wheel_scroll (GimpControllerWheel *wheel,
*/
for (i = G_N_ELEMENTS (wheel_events) - 1; i >= 0; i--)
{
if (wheel_events[i].direction == sevent->direction)
if (wheel_events[i].direction == sevent->direction &&
(wheel_events[i].modifiers & sevent->state) ==
wheel_events[i].modifiers)
{
if ((wheel_events[i].modifiers & sevent->state) ==
wheel_events[i].modifiers)
{
GimpControllerEvent controller_event;
GimpControllerEventTrigger *trigger;
GimpControllerEvent controller_event;
GimpControllerEventTrigger *trigger;
trigger = (GimpControllerEventTrigger *) &controller_event;
trigger = (GimpControllerEventTrigger *) &controller_event;
trigger->type = GIMP_CONTROLLER_EVENT_TRIGGER;
trigger->source = GIMP_CONTROLLER (wheel);
trigger->event_id = i;
trigger->type = GIMP_CONTROLLER_EVENT_TRIGGER;
trigger->source = GIMP_CONTROLLER (wheel);
trigger->event_id = i;
return gimp_controller_event (GIMP_CONTROLLER (wheel),
&controller_event);
}
return gimp_controller_event (GIMP_CONTROLLER (wheel),
&controller_event);
}
}