GNOME.org
 

[gtk/wip/baedert/for-master: 132/135] debug: Remove resize highlighting

commit f721d2de15c1798a45376cdb3a321fec477592bb
Author: Timm Bäder <mail baedert org>
Date:   Sun Jul 12 11:20:31 2020 +0200

    debug: Remove resize highlighting
    
    This has been broken ever since the debug highlighting moved to
    inspector overlays.

 gtk/gtkdebug.h          |  9 ++++-----
 gtk/gtkmain.c           |  1 -
 gtk/gtkwidget.c         | 39 ---------------------------------------
 gtk/gtkwidgetprivate.h  |  4 ----
 gtk/inspector/visual.c  | 21 ---------------------
 gtk/inspector/visual.ui | 30 ------------------------------
 6 files changed, 4 insertions(+), 100 deletions(-)
---
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 41c8185329..4b1a4806e3 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -48,11 +48,10 @@ typedef enum {
   GTK_DEBUG_INTERACTIVE     = 1 << 10,
   GTK_DEBUG_TOUCHSCREEN     = 1 << 11,
   GTK_DEBUG_ACTIONS         = 1 << 12,
-  GTK_DEBUG_RESIZE          = 1 << 13,
-  GTK_DEBUG_LAYOUT          = 1 << 14,
-  GTK_DEBUG_SNAPSHOT        = 1 << 15,
-  GTK_DEBUG_CONSTRAINTS     = 1 << 16,
-  GTK_DEBUG_BUILDER_OBJECTS = 1 << 17,
+  GTK_DEBUG_LAYOUT          = 1 << 13,
+  GTK_DEBUG_SNAPSHOT        = 1 << 14,
+  GTK_DEBUG_CONSTRAINTS     = 1 << 15,
+  GTK_DEBUG_BUILDER_OBJECTS = 1 << 16,
 } GtkDebugFlag;
 
 #ifdef G_ENABLE_DEBUG
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4ce05ced76..b4f74264a6 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -181,7 +181,6 @@ static const GdkDebugKey gtk_debug_keys[] = {
   { "no-css-cache", GTK_DEBUG_NO_CSS_CACHE, "Disable style property cache" },
   { "interactive", GTK_DEBUG_INTERACTIVE, "Enable the GTK inspector" },
   { "touchscreen", GTK_DEBUG_TOUCHSCREEN, "Pretend the pointer is a touchscreen" },
-  { "resize", GTK_DEBUG_RESIZE, "Highlight resizing widgets" },
   { "layout", GTK_DEBUG_LAYOUT, "Show layout borders" },
   { "snapshot", GTK_DEBUG_SNAPSHOT, "Generate debug render nodes" },
 };
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 9c1b2570ae..55d541e054 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2254,9 +2254,6 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class)
   priv->alloc_needed_on_child = TRUE;
   priv->draw_needed = TRUE;
   priv->focus_on_click = TRUE;
-#ifdef G_ENABLE_DEBUG
-  priv->highlight_resize = FALSE;
-#endif
   priv->can_focus = TRUE;
   priv->focusable = FALSE;
   priv->can_target = TRUE;
@@ -3811,12 +3808,6 @@ gtk_widget_allocate (GtkWidget    *widget,
     }
 
 #ifdef G_ENABLE_DEBUG
-  if (GTK_DISPLAY_DEBUG_CHECK (_gtk_widget_get_display (widget), RESIZE))
-    {
-      priv->highlight_resize = TRUE;
-      gtk_widget_queue_draw (widget);
-    }
-
   if (gtk_widget_get_resize_needed (widget))
     {
       g_warning ("Allocating size to %s %p without calling gtk_widget_measure(). "
@@ -11356,32 +11347,6 @@ gtk_widget_list_controllers (GtkWidget           *widget,
   return (GtkEventController **)g_ptr_array_free (controllers, FALSE);
 }
 
-static inline void
-gtk_widget_maybe_add_debug_render_nodes (GtkWidget   *widget,
-                                         GtkSnapshot *snapshot)
-{
-#ifdef G_ENABLE_DEBUG
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  GdkDisplay *display = _gtk_widget_get_display (widget);
-
-  if (GTK_DISPLAY_DEBUG_CHECK (display, RESIZE) && priv->highlight_resize)
-    {
-      GdkRGBA blue = {0, 0, 1, 0.2};
-      graphene_rect_t bounds;
-
-      graphene_rect_init (&bounds,
-                          0, 0,
-                          priv->width, priv->height);
-
-      gtk_snapshot_append_color (snapshot,
-                                 &blue,
-                                 &bounds);
-      priv->highlight_resize = FALSE;
-      gtk_widget_queue_draw (widget);
-    }
-#endif
-}
-
 static GskRenderNode *
 gtk_widget_create_render_node (GtkWidget   *widget,
                                GtkSnapshot *snapshot)
@@ -11436,10 +11401,6 @@ gtk_widget_create_render_node (GtkWidget   *widget,
 
   gtk_css_filter_value_pop_snapshot (filter_value, snapshot);
 
-#ifdef G_ENABLE_DEBUG
-  gtk_widget_maybe_add_debug_render_nodes (widget, snapshot);
-#endif
-
   gtk_snapshot_pop (snapshot);
 
   return gtk_snapshot_pop_collect (snapshot);
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 1fa09c48fb..d674b9867d 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -66,10 +66,6 @@ struct _GtkWidgetPrivate
 
   guint direction             : 2;
 
-#ifdef G_ENABLE_DEBUG
-  guint highlight_resize      : 1;
-#endif
-
   guint in_destruction        : 1;
   guint realized              : 1;
   guint mapped                : 1;
diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 7f1b40d635..a8d27c21ac 100644
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -83,7 +83,6 @@ struct _GtkInspectorVisualPrivate
   GtkWidget *fallback_switch;
   GtkWidget *baselines_switch;
   GtkWidget *layout_switch;
-  GtkWidget *resize_switch;
   GtkWidget *focus_switch;
 
   GtkWidget *misc_box;
@@ -422,19 +421,6 @@ layout_activate (GtkSwitch          *sw,
   redraw_everything ();
 }
 
-static void
-widget_resize_activate (GtkSwitch *sw)
-{
-  guint flags = gtk_get_debug_flags ();
-
-  if (gtk_switch_get_active (sw))
-    flags |= GTK_DEBUG_RESIZE;
-  else
-    flags &= ~GTK_DEBUG_RESIZE;
-
-  gtk_set_debug_flags (flags);
-}
-
 static void
 focus_activate (GtkSwitch          *sw,
                 GParamSpec         *pspec,
@@ -1014,11 +1000,6 @@ row_activated (GtkListBox         *box,
       GtkSwitch *sw = GTK_SWITCH (vis->priv->layout_switch);
       gtk_switch_set_active (sw, !gtk_switch_get_active (sw));
     }
-  else if (gtk_widget_is_ancestor (vis->priv->resize_switch, GTK_WIDGET (row)))
-    {
-      GtkSwitch *sw = GTK_SWITCH (vis->priv->resize_switch);
-      gtk_switch_set_active (sw, !gtk_switch_get_active (sw));
-    }
   else if (gtk_widget_is_ancestor (vis->priv->focus_switch, GTK_WIDGET (row)))
     {
       GtkSwitch *sw = GTK_SWITCH (vis->priv->focus_switch);
@@ -1164,7 +1145,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, fallback_switch);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, baselines_switch);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, layout_switch);
-  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, resize_switch);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, focus_switch);
 
   gtk_widget_class_bind_template_callback (widget_class, fps_activate);
@@ -1173,7 +1153,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, direction_changed);
   gtk_widget_class_bind_template_callback (widget_class, baselines_activate);
   gtk_widget_class_bind_template_callback (widget_class, layout_activate);
-  gtk_widget_class_bind_template_callback (widget_class, widget_resize_activate);
   gtk_widget_class_bind_template_callback (widget_class, focus_activate);
   gtk_widget_class_bind_template_callback (widget_class, software_gl_activate);
 
diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 8dece056b5..223bdb3911 100644
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -560,35 +560,6 @@
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkListBoxRow">
-                            <child>
-                              <object class="GtkBox">
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="margin-top">10</property>
-                                <property name="margin-bottom">10</property>
-                                <property name="spacing">40</property>
-                                <child>
-                                  <object class="GtkLabel" id="resize_label">
-                                    <property name="label" translatable="yes">Show Widget Resizes</property>
-                                    <property name="halign">start</property>
-                                    <property name="valign">baseline</property>
-                                    <property name="xalign">0.0</property>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkSwitch" id="resize_switch">
-                                    <property name="halign">end</property>
-                                    <property name="valign">baseline</property>
-                                    <property name="hexpand">1</property>
-                                    <signal name="notify::active" handler="widget_resize_activate"/>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkListBoxRow">
                             <child>
@@ -712,7 +683,6 @@
       <widget name="fallback_label"/>
       <widget name="baselines_label"/>
       <widget name="layout_label"/>
-      <widget name="resize_label"/>
       <widget name="focus_label"/>
       <widget name="touchscreen_label"/>
       <widget name="software_gl_label"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]