diff options
| author | Timm Bäder <mail@baedert.org> | 2018-07-07 23:03:19 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2018-07-08 09:41:15 +0200 |
| commit | 074eb2a19d6caff5b680fe9a4a8e8629e9e16e0a (patch) | |
| tree | 772fe7e17d600cad5a05dd1a82bd4025e6350378 /gtk/gtkaccellabel.c | |
| parent | 96812450fa891728c17fc88aa026b692d3b6f5f5 (diff) | |
| download | gtk+-074eb2a19d6caff5b680fe9a4a8e8629e9e16e0a.tar.gz | |
accellabel: Add newline between consecutive if statements
Diffstat (limited to 'gtk/gtkaccellabel.c')
| -rw-r--r-- | gtk/gtkaccellabel.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index e8945124e9..1781cb6e11 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -722,64 +722,71 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass, GString *gstring; gboolean seen_mod = FALSE; gunichar ch; - - gstring = g_string_new (""); - + + gstring = g_string_sized_new (10); /* ~len('backspace') */ + if (accelerator_mods & GDK_SHIFT_MASK) { g_string_append (gstring, klass->mod_name_shift); seen_mod = TRUE; } + if (accelerator_mods & GDK_CONTROL_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, klass->mod_name_control); seen_mod = TRUE; } + if (accelerator_mods & GDK_MOD1_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, klass->mod_name_alt); seen_mod = TRUE; } + if (accelerator_mods & GDK_MOD2_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, "Mod2"); seen_mod = TRUE; } + if (accelerator_mods & GDK_MOD3_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, "Mod3"); seen_mod = TRUE; } + if (accelerator_mods & GDK_MOD4_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, "Mod4"); seen_mod = TRUE; } + if (accelerator_mods & GDK_MOD5_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); g_string_append (gstring, "Mod5"); seen_mod = TRUE; } + if (accelerator_mods & GDK_SUPER_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); /* This is the text that should appear next to menu accelerators * that use the super key. If the text on this key isn't typically @@ -789,10 +796,11 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass, g_string_append (gstring, C_("keyboard label", "Super")); seen_mod = TRUE; } + if (accelerator_mods & GDK_HYPER_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); /* This is the text that should appear next to menu accelerators * that use the hyper key. If the text on this key isn't typically @@ -802,10 +810,11 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass, g_string_append (gstring, C_("keyboard label", "Hyper")); seen_mod = TRUE; } + if (accelerator_mods & GDK_META_MASK) { if (seen_mod) - g_string_append (gstring, klass->mod_separator); + g_string_append (gstring, klass->mod_separator); #ifndef GDK_WINDOWING_QUARTZ /* This is the text that should appear next to menu accelerators |