gtkwindow: Bypass WM menu handling if there's a GTK+ grab present

That means events wouldn't be emitted to this window, but to the grabbing widget (eg. a popover). It is not expected to raise the WM menu in that case.
window: Update opaque region if background-color changes
2018-07-26 14:26:22 +02:00 · 2018-07-13 15:02:47 +02:00 · 2018-07-10 13:02:08 +00:00 · 2018-07-09 15:27:51 +00:00 · 2018-07-07 19:48:26 +00:00 · 2018-07-03 19:27:15 +02:00
6 changed files with 642 additions and 521 deletions
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1432,7 +1432,7 @@ multipress_gesture_pressed_cb (GtkGestureMultiPress *gesture,
                               gdouble               y,
                               GtkWindow            *window)
 {
-  GtkWidget *event_widget, *widget;
+  GtkWidget *event_widget, *widget, *grab_widget;
  GdkEventSequence *sequence;
  GtkWindowRegion region;
  GtkWindowPrivate *priv;
@@ -1454,8 +1454,11 @@ multipress_gesture_pressed_cb (GtkGestureMultiPress *gesture,

  region = get_active_region_type (window, (GdkEventAny*) event, x, y);

+  grab_widget = gtk_window_group_get_current_grab (gtk_window_get_group (window));
+
  if (gdk_display_device_is_grabbed (gtk_widget_get_display (widget),
-                                     gtk_gesture_get_device (GTK_GESTURE (gesture))))
+                                     gtk_gesture_get_device (GTK_GESTURE (gesture))) ||
+      (grab_widget && grab_widget != widget))
    {
      gtk_gesture_set_state (priv->drag_gesture, GTK_EVENT_SEQUENCE_DENIED);
      return;
@@ -7227,7 +7230,7 @@ subtract_corners_from_region (cairo_region_t        *region,

 static void
 update_opaque_region (GtkWindow           *window,
-                      GtkBorder           *border,
+                      const GtkBorder     *border,
                      const GtkAllocation *allocation)
 {
  GtkWidget *widget = GTK_WIDGET (window);
@@ -9005,11 +9008,24 @@ static void
 gtk_window_style_updated (GtkWidget *widget)
 {
  GtkCssStyleChange *change = gtk_style_context_get_change (gtk_widget_get_style_context (widget));
+  GtkWindow *window = GTK_WINDOW (widget);

  GTK_WIDGET_CLASS (gtk_window_parent_class)->style_updated (widget);

+  if (!_gtk_widget_get_alloc_needed (widget) &&
+      (change == NULL || gtk_css_style_change_changes_property (change, GTK_CSS_PROPERTY_BACKGROUND_COLOR)))
+    {
+      GtkAllocation allocation;
+      GtkBorder window_border;
+
+      _gtk_widget_get_allocation (widget, &allocation);
+      get_shadow_width (window, &window_border);
+
+      update_opaque_region (window, &window_border, &allocation);
+    }
+
  if (change == NULL || gtk_css_style_change_changes_property (change, GTK_CSS_PROPERTY_ICON_THEME))
-    update_themed_icon (GTK_WINDOW (widget));
+    update_themed_icon (window);
 }

 /**
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1368,7 +1368,7 @@ treeview.view {
  -GtkTreeView-grid-line-pattern: '';
  -GtkTreeView-tree-line-width: 1;
  -GtkTreeView-tree-line-pattern: '';
-  -GtkTreeView-expander-size: 16;
+  -GtkTreeView-expander-size: 24;

  border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color,
  border-top-color: $bg_color;                         // while this is the grid lines color, better then nothing
@@ -2832,8 +2832,8 @@ row.activatable {

 expander {
  title > arrow {
-    min-width: 16px;
-    min-height: 16px;
+    min-width: 24px;
+    min-height: 24px;
    -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
    &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }

--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -548,7 +548,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
 .path-bar button image { padding-top: 1px; }

 /************** Tree Views * */
-treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; border-left-color: #888888; border-top-color: #000; }
+treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 24; border-left-color: #888888; border-top-color: #000; }

 treeview.view:selected { border-radius: 0; }

@@ -1240,7 +1240,7 @@ row:hover, row.activatable:hover { transition: none; }
 .app-notification border, .app-notification.frame border { border-width: 0; }

 /************* Expanders * */
-expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+expander title > arrow { min-width: 24px; min-height: 24px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }

 expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }

--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -552,7 +552,7 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen
 .path-bar button image { padding-top: 1px; }

 /************** Tree Views * */
-treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 16; border-left-color: gray; border-top-color: #fff; }
+treeview.view { -GtkTreeView-grid-line-width: 1; -GtkTreeView-grid-line-pattern: ''; -GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-pattern: ''; -GtkTreeView-expander-size: 24; border-left-color: gray; border-top-color: #fff; }

 treeview.view:selected { border-radius: 0; }

@@ -1246,7 +1246,7 @@ row:hover, row.activatable:hover { transition: none; }
 .app-notification border, .app-notification.frame border { border-width: 0; }

 /************* Expanders * */
-expander title > arrow { min-width: 16px; min-height: 16px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
+expander title > arrow { min-width: 24px; min-height: 24px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }

 expander title > arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }

--- a/po-properties/de.po
+++ b/po-properties/de.po
--- a/po-properties/pt_BR.po
+++ b/po-properties/pt_BR.po
Author	SHA1	Message	Date
Carlos Garnacho	9febe9efd0	gtkwindow: Bypass WM menu handling if there's a GTK+ grab present That means events wouldn't be emitted to this window, but to the grabbing widget (eg. a popover). It is not expected to raise the WM menu in that case.	2018-07-26 14:26:22 +02:00
Benjamin Otte	9008f7702d	window: Update opaque region if background-color changes The opaque region is only set when the background color is opaque. So we need to do something about it when the background color changes. However, in the case where a size allocation is going to happen, we already do this update in size_allocate(), so in that case avoid doing it twice.	2018-07-13 15:02:47 +02:00
Bruno Lopes da Silva	df0454236c	Update Brazilian Portuguese translation	2018-07-10 13:02:08 +00:00
Jakub Steiner	8373b906d4	Merge branch 'expander-size-3' into 'gtk-3-24' HighContrast: Restore expander size See merge request GNOME/gtk!210	2018-07-09 15:27:51 +00:00
Mario Blättermann	0bca6969d4	Update German translation	2018-07-07 19:48:26 +00:00
Samuel Thibault	660087db42	HighContrast: Restore expander size Expanders used to be 16px high. With the move from the gtk2 rendering to gtk3 rendering they shrunk to 12px, making them hard to see, because it's now the icon which is 16px high and the icon contains transparent borders. This makes the HighContrast theme use 24px icons instead, to restore 16px expanders. This may expander some containers a bit. Closes #1046	2018-07-03 19:27:15 +02:00