From: Timm Bäder <mail@baedert.org>
Date: Wed, 28 Aug 2019 11:52:16 +0000 (+0200)
Subject: inspect-button: Inline deemphasize_window() into only caller
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~917
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7c723dfc58ba195bcb13ed56264e6098f37b91ef;p=gtk4.git

inspect-button: Inline deemphasize_window() into only caller
---

diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index 41157296b7..4bdb049252 100644
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -108,27 +108,6 @@ on_inspect_widget (GtkInspectorWindow *iw,
     select_widget (iw, widget);
 }
 
-static void
-deemphasize_window (GtkWidget *window)
-{
-  GdkDisplay *display;
-
-  display = gtk_widget_get_display (window);
-  if (gdk_display_is_composited (display))
-    {
-      cairo_rectangle_int_t rect;
-      cairo_region_t *region;
-
-      gtk_widget_set_opacity (window, 0.3);
-      rect.x = rect.y = rect.width = rect.height = 0;
-      region = cairo_region_create_rectangle (&rect);
-      gtk_widget_input_shape_combine_region (window, region);
-      cairo_region_destroy (region);
-    }
-  else
-    gdk_surface_lower (gtk_native_get_surface (GTK_NATIVE (window)));
-}
-
 static void
 reemphasize_window (GtkWidget *window)
 {
@@ -211,8 +190,24 @@ void
 gtk_inspector_on_inspect (GtkWidget          *button,
                           GtkInspectorWindow *iw)
 {
+  GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (iw));
+
+  /* de-emphasize window */
+  if (gdk_display_is_composited (display))
+    {
+      cairo_rectangle_int_t rect;
+      cairo_region_t *region;
+
+      gtk_widget_set_opacity (GTK_WIDGET (iw), 0.3);
+      rect.x = rect.y = rect.width = rect.height = 0;
+      region = cairo_region_create_rectangle (&rect);
+      gtk_widget_input_shape_combine_region (GTK_WIDGET (iw), region);
+      cairo_region_destroy (region);
+    }
+  else
+    gdk_surface_lower (gtk_native_get_surface (GTK_NATIVE (iw)));
+
   g_signal_connect (iw, "event", G_CALLBACK (handle_event), NULL);
-  deemphasize_window (GTK_WIDGET (iw));
 }
 
 static gboolean