aboutsummarylogtreecommitdiffstats
path: root/popovers__color-chooser.patch
diff options
context:
space:
mode:
authorTomasz Gąsior2017-10-30 23:27:08 +0100
committerTomasz Gąsior2017-10-30 23:27:08 +0100
commit5cf658e0f85d1dc22cd8558b9b43ed1ec4160a5c (patch)
tree078a71fecb8d36fba501d599419538d68c1d2aca /popovers__color-chooser.patch
parent29c8a12c01326fef6b634d83fb3f02dfbaf2184b (diff)
downloadaur-5cf658e0f85d1dc22cd8558b9b43ed1ec4160a5c.tar.gz
GTK updated.
- Menu of GtkMenuButton is displayed as popover only if GTK_CSD env variable doesn't exists. - Fixes for GNOME developers mistake added.
Diffstat (limited to 'popovers__color-chooser.patch')
-rw-r--r--popovers__color-chooser.patch31
1 files changed, 16 insertions, 15 deletions
diff --git a/popovers__color-chooser.patch b/popovers__color-chooser.patch
index 65c2089a90d3..a216122f4c63 100644
--- a/popovers__color-chooser.patch
+++ b/popovers__color-chooser.patch
@@ -1,24 +1,25 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
---- ./org/gtk/gtkcolorswatch.c 2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkcolorswatch.c 2017-07-30 13:40:06.546839046 +0200
-@@ -345,10 +345,20 @@
- }
-
+diff --color -U 5 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
+--- ./org/gtk/gtkcolorswatch.c 2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkcolorswatch.c 2017-10-30 21:46:59.750398031 +0100
+@@ -347,10 +347,21 @@
static void
do_popup (GtkColorSwatch *swatch)
{
-+ if (swatch->priv->popover == NULL) {
+ if (swatch->priv->popover == NULL)
+ {
+ GtkWidget *item;
-+ swatch->priv->popover = gtk_menu_new();
-+ item = gtk_menu_item_new_with_mnemonic(_("C_ustomize"));
++ swatch->priv->popover = gtk_menu_new ();
++ item = gtk_menu_item_new_with_mnemonic (_ ("C_ustomize"));
+ g_signal_connect_swapped (item, "activate", G_CALLBACK (emit_customize), swatch);
-+ gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
-+ gtk_menu_shell_append(GTK_MENU_SHELL(swatch->priv->popover), item);
-+ }
-+ gtk_menu_popup_at_pointer(GTK_MENU(swatch->priv->popover), NULL);
++ gtk_widget_set_visible (GTK_WIDGET (item), TRUE);
++ gtk_menu_shell_append (GTK_MENU_SHELL (swatch->priv->popover), item);
++ }
++ gtk_menu_popup_at_pointer (GTK_MENU (swatch->priv->popover), NULL);
+ return;
- if (swatch->priv->popover == NULL)
- {
++ if (swatch->priv->popover == NULL)
++ {
GtkWidget *box;
GtkWidget *item;
+ swatch->priv->popover = gtk_popover_new (GTK_WIDGET (swatch));
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);