smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: code style

Browse source
This commit is contained in:
Robin Gareus 2022-06-21 22:11:08 +02:00
parent af38528174
commit 5b03bf72fa
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/gtkmm2ext/gtkmm2ext/keyboard.h
View file

@ -80,15 +80,15 @@ public:
static const char* tertiary_modifier_name (); static const char* tertiary_modifier_name ();
static const char* level4_modifier_name (); static const char* level4_modifier_name ();
static const char* button2_name ();
static const char* momentary_push_name ();
static const char* group_override_event_name ();
static const char* primary_modifier_short_name (); static const char* primary_modifier_short_name ();
static const char* secondary_modifier_short_name (); static const char* secondary_modifier_short_name ();
static const char* tertiary_modifier_short_name (); static const char* tertiary_modifier_short_name ();
static const char* level4_modifier_short_name (); static const char* level4_modifier_short_name ();
static const char* button2_name ();
static const char* momentary_push_name ();
static const char* group_override_event_name ();
bool key_is_down (uint32_t keyval); bool key_is_down (uint32_t keyval);
guint modifier_state (); guint modifier_state ();

5
libs/gtkmm2ext/keyboard.cc
View file

@ -197,6 +197,7 @@ guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier | Keyboard::Level4M
#endif #endif
guint Keyboard::group_override_modifiers = Keyboard::TertiaryModifier; guint Keyboard::group_override_modifiers = Keyboard::TertiaryModifier;
const char* const char*
Keyboard::group_override_event_name () Keyboard::group_override_event_name ()
{ {
@ -651,7 +652,7 @@ Keyboard::is_button2_event (GdkEventButton* ev)
{ {
return (ev->button == 2) || return (ev->button == 2) ||
((ev->button == 1) && Keyboard::button2_modifiers != 0 && ((ev->button == 1) && Keyboard::button2_modifiers != 0 &&
((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifier ()));
} }
bool bool
@ -659,7 +660,7 @@ Keyboard::is_momentary_push_event (GdkEventButton* ev)
{ {
return (is_button2_event (ev)) || return (is_button2_event (ev)) ||
((ev->button == 1) && Keyboard::momentary_push_modifiers != 0 && ((ev->button == 1) && Keyboard::momentary_push_modifiers != 0 &&
((ev->state & RelevantModifierKeyMask) == Keyboard::momentary_push_modifiers)); ((ev->state & RelevantModifierKeyMask) == Keyboard::momentary_push_modifier ()));
} }
bool bool