diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c
index 68674b7fed..3538cec0e5 100644
--- a/gsk/gskdebug.c
+++ b/gsk/gskdebug.c
@@ -11,8 +11,7 @@ static const GdkDebugKey gsk_debug_keys[] = {
{ "surface", GSK_DEBUG_SURFACE, "Information about surfaces" },
{ "fallback", GSK_DEBUG_FALLBACK, "Information about fallbacks" },
{ "glyphcache", GSK_DEBUG_GLYPH_CACHE, "Information about glyph caching" },
- { "diff", GSK_DEBUG_DIFF, "Show differences" },
- { "geometry", GSK_DEBUG_GEOMETRY, "Show borders" },
+ { "geometry", GSK_DEBUG_GEOMETRY, "Show borders (when using cairo)" },
{ "full-redraw", GSK_DEBUG_FULL_REDRAW, "Force full redraws" },
{ "sync", GSK_DEBUG_SYNC, "Sync after each frame" },
{ "vulkan-staging-image", GSK_DEBUG_VULKAN_STAGING_IMAGE, "Use a staging image for Vulkan texture upload" },
diff --git a/gsk/gskdebugprivate.h b/gsk/gskdebugprivate.h
index acf9bf7547..345c1555ab 100644
--- a/gsk/gskdebugprivate.h
+++ b/gsk/gskdebugprivate.h
@@ -14,7 +14,6 @@ typedef enum {
GSK_DEBUG_VULKAN = 1 << 5,
GSK_DEBUG_FALLBACK = 1 << 6,
GSK_DEBUG_GLYPH_CACHE = 1 << 7,
- GSK_DEBUG_DIFF = 1 << 8,
/* flags below may affect behavior */
GSK_DEBUG_GEOMETRY = 1 << 9,
GSK_DEBUG_FULL_REDRAW = 1 << 10,
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b4f74264a6..c13a85edce 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -173,15 +173,15 @@ static const GdkDebugKey gtk_debug_keys[] = {
{ "geometry", GTK_DEBUG_GEOMETRY, "Information about size allocation" },
{ "size-request", GTK_DEBUG_SIZE_REQUEST, "Information about size requests" },
{ "actions", GTK_DEBUG_ACTIONS, "Information about actions and menu models" },
- { "constraints", GTK_DEBUG_CONSTRAINTS, "Information about constraints" },
+ { "constraints", GTK_DEBUG_CONSTRAINTS, "Information from the constraints solver" },
{ "text", GTK_DEBUG_TEXT, "Information about GtkTextView" },
{ "tree", GTK_DEBUG_TREE, "Information about GtkTreeView" },
+ { "layout", GTK_DEBUG_LAYOUT, "Information from layout managers" },
{ "builder", GTK_DEBUG_BUILDER, "Trace GtkBuilder operation" },
{ "builder-objects", GTK_DEBUG_BUILDER_OBJECTS, "Log unused GtkBuilder objects" },
{ "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" },
- { "layout", GTK_DEBUG_LAYOUT, "Show layout borders" },
{ "snapshot", GTK_DEBUG_SNAPSHOT, "Generate debug render nodes" },
};
#endif /* G_ENABLE_DEBUG */
diff --git a/gtk/inspector/logs.c b/gtk/inspector/logs.c
index 58f43386eb..956db9136f 100644
--- a/gtk/inspector/logs.c
+++ b/gtk/inspector/logs.c
@@ -76,6 +76,8 @@ struct _GtkInspectorLogs
GtkWidget *printing;
GtkWidget *tree;
GtkWidget *text;
+ GtkWidget *constraints;
+ GtkWidget *layout;
GdkDisplay *display;
};
@@ -170,6 +172,8 @@ flag_toggled (GtkWidget *button,
update_flag (logs->printing, &flags, GTK_DEBUG_PRINTING);
update_flag (logs->tree, &flags, GTK_DEBUG_TREE);
update_flag (logs->text, &flags, GTK_DEBUG_TEXT);
+ update_flag (logs->constraints, &flags, GTK_DEBUG_CONSTRAINTS);
+ update_flag (logs->layout, &flags, GTK_DEBUG_LAYOUT);
gtk_set_display_debug_flags (logs->display, flags);
}
@@ -211,6 +215,8 @@ gtk_inspector_logs_class_init (GtkInspectorLogsClass *klass)
gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, printing);
gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, tree);
gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, text);
+ gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, constraints);
+ gtk_widget_class_bind_template_child (widget_class, GtkInspectorLogs, layout);
gtk_widget_class_bind_template_callback (widget_class, flag_toggled);
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
diff --git a/gtk/inspector/logs.ui b/gtk/inspector/logs.ui
index 89236ec6aa..fb9e4383d5 100644
--- a/gtk/inspector/logs.ui
+++ b/gtk/inspector/logs.ui
@@ -215,6 +215,18 @@
+
+
+
+
+
+