AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

combobox: Port bindings to use shortcuts

Browse Source
This commit is contained in:
Benjamin Otte 2018-08-05 04:30:15 +02:00 committed by Matthias Clasen
parent 4f128a4a21
commit 6c13bbb441
1 changed files with 68 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
gtk/gtkcombobox.c
View File

@ -409,7 +409,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
GObjectClass *object_class; GObjectClass *object_class;
GtkContainerClass *container_class; GtkContainerClass *container_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkBindingSet *binding_set;
container_class = (GtkContainerClass *)klass; container_class = (GtkContainerClass *)klass;
container_class->forall = gtk_combo_box_forall; container_class->forall = gtk_combo_box_forall;
@ -560,57 +559,77 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
G_TYPE_STRING, 1, G_TYPE_STRING); G_TYPE_STRING, 1, G_TYPE_STRING);
/* key bindings */ /* key bindings */
binding_set = gtk_binding_set_by_class (widget_class); gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_Down, GDK_MOD1_MASK,
"popup",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_KP_Down, GDK_MOD1_MASK,
"popup",
NULL);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_MOD1_MASK, gtk_widget_class_add_binding_signal (widget_class,
"popup", 0); GDK_KEY_Up, GDK_MOD1_MASK,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, GDK_MOD1_MASK, "popdown",
"popup", 0); NULL);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_KP_Up, GDK_MOD1_MASK,
"popdown",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_Escape, 0,
"popdown",
NULL);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_MOD1_MASK, gtk_widget_class_add_binding_signal (widget_class,
"popdown", 0); GDK_KEY_Up, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, GDK_MOD1_MASK, "move-active",
"popdown", 0); "(i)", GTK_SCROLL_STEP_UP);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, gtk_widget_class_add_binding_signal (widget_class,
"popdown", 0); GDK_KEY_KP_Up, 0,
"move-active",
"(i)", GTK_SCROLL_STEP_UP);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_Page_Up, 0,
"move-active",
"(i)", GTK_SCROLL_PAGE_UP);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_KP_Page_Up, 0,
"move-active",
"(i)", GTK_SCROLL_PAGE_UP);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_Home, 0,
"move-active",
"(i)", GTK_SCROLL_START);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_KP_Home, 0,
"move-active",
"(i)", GTK_SCROLL_START);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, gtk_widget_class_add_binding_signal (widget_class,
"move-active", 1, GDK_KEY_Down, 0,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); "move-active",
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Up, 0, "(i)", GTK_SCROLL_STEP_DOWN);
"move-active", 1, gtk_widget_class_add_binding_signal (widget_class,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); GDK_KEY_KP_Down, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, "move-active",
"move-active", 1, "(i)", GTK_SCROLL_STEP_DOWN);
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP); gtk_widget_class_add_binding_signal (widget_class,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, GDK_KEY_Page_Down, 0,
"move-active", 1, "move-active",
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP); "(i)", GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Home, 0, gtk_widget_class_add_binding_signal (widget_class,
"move-active", 1, GDK_KEY_KP_Page_Down, 0,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_START); "move-active",
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Home, 0, "(i)", GTK_SCROLL_PAGE_DOWN);
"move-active", 1, gtk_widget_class_add_binding_signal (widget_class,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_START); GDK_KEY_End, 0,
"move-active",
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, "(i)", GTK_SCROLL_END);
"move-active", 1, gtk_widget_class_add_binding_signal (widget_class,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); GDK_KEY_KP_End, 0,
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Down, 0, "move-active",
"move-active", 1, "(i)", GTK_SCROLL_END);
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_End, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_END);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_End, 0,
"move-active", 1,
GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_END);
/* properties */ /* properties */
g_object_class_override_property (object_class, g_object_class_override_property (object_class,