AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 15:14:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!2265
This commit is contained in:
Matthias Clasen 2020-07-19 19:14:04 +00:00
commit b5e20a3e37
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,7 +1,7 @@
Overview of Changes in GTK 3.99.0 Overview of Changes in GTK 3.99.0
================================= =================================
* Add GtkEditableLabel * Add GtkEditableLabel, a label that can be edited
* Add GtkBookmarkList, a list model for bookmarks * Add GtkBookmarkList, a list model for bookmarks

15
gtk/gtkwindowhandle.c
View File

@ -268,7 +268,6 @@ perform_titlebar_action (GtkWindowHandle *self,
GtkSettings *settings; GtkSettings *settings;
gchar *action = NULL; gchar *action = NULL;
gboolean retval = TRUE; gboolean retval = TRUE;
GtkActionMuxer *context;
settings = gtk_widget_get_settings (GTK_WIDGET (self)); settings = gtk_widget_get_settings (GTK_WIDGET (self));
switch (button) switch (button)
@ -287,23 +286,21 @@ perform_titlebar_action (GtkWindowHandle *self,
break; break;
} }
context = _gtk_widget_get_action_muxer (GTK_WIDGET (self), TRUE);
if (action == NULL) if (action == NULL)
retval = FALSE; retval = FALSE;
else if (g_str_equal (action, "none")) else if (g_str_equal (action, "none"))
retval = FALSE; retval = FALSE;
/* treat all maximization variants the same */ /* treat all maximization variants the same */
else if (g_str_has_prefix (action, "toggle-maximize")) else if (g_str_has_prefix (action, "toggle-maximize"))
g_action_group_activate_action (G_ACTION_GROUP (context), gtk_widget_activate_action (GTK_WIDGET (self),
"window.toggle-maximized", "window.toggle-maximized",
NULL); NULL);
else if (g_str_equal (action, "lower")) else if (g_str_equal (action, "lower"))
lower_window (self); lower_window (self);
else if (g_str_equal (action, "minimize")) else if (g_str_equal (action, "minimize"))
g_action_group_activate_action (G_ACTION_GROUP (context), gtk_widget_activate_action (GTK_WIDGET (self),
"window.minimize", "window.minimize",
NULL); NULL);
else if (g_str_equal (action, "menu")) else if (g_str_equal (action, "menu"))
do_popup (self, event); do_popup (self, event);
else else