diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 1f50020bfc..d278a2656b 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -90,7 +90,6 @@ struct _GtkInspectorGeneralPrivate GtkWidget *display_rgba; GtkWidget *display_composited; GtkSizeGroup *labels; - GtkAdjustment *focus_adjustment; GdkDisplay *display; }; @@ -816,7 +815,6 @@ static gboolean keynav_failed (GtkWidget *widget, GtkDirectionType direction, GtkInspectorGeneral *gen) { GtkWidget *next; - gdouble value, lower, upper, page; if (direction == GTK_DIR_DOWN && widget == gen->priv->version_box) next = gen->priv->env_box; @@ -847,22 +845,6 @@ keynav_failed (GtkWidget *widget, GtkDirectionType direction, GtkInspectorGenera return TRUE; } - value = gtk_adjustment_get_value (gen->priv->focus_adjustment); - lower = gtk_adjustment_get_lower (gen->priv->focus_adjustment); - upper = gtk_adjustment_get_upper (gen->priv->focus_adjustment); - page = gtk_adjustment_get_page_size (gen->priv->focus_adjustment); - - if (direction == GTK_DIR_UP && value > lower) - { - gtk_adjustment_set_value (gen->priv->focus_adjustment, lower); - return TRUE; - } - else if (direction == GTK_DIR_DOWN && value < upper - page) - { - gtk_adjustment_set_value (gen->priv->focus_adjustment, upper - page); - return TRUE; - } - return FALSE; } @@ -873,10 +855,6 @@ gtk_inspector_general_constructed (GObject *object) G_OBJECT_CLASS (gtk_inspector_general_parent_class)->constructed (object); - gen->priv->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (gen->priv->swin)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (gen->priv->box), - gen->priv->focus_adjustment); - g_signal_connect (gen->priv->version_box, "keynav-failed", G_CALLBACK (keynav_failed), gen); g_signal_connect (gen->priv->env_box, "keynav-failed", G_CALLBACK (keynav_failed), gen); g_signal_connect (gen->priv->display_box, "keynav-failed", G_CALLBACK (keynav_failed), gen); diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 46349bd595..5e2bb76ad5 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -90,8 +90,6 @@ struct _GtkInspectorVisualPrivate GtkWidget *touchscreen_switch; GtkWidget *software_gl_switch; - GtkAdjustment *focus_adjustment; - GtkInspectorOverlay *fps_overlay; GtkInspectorOverlay *updates_overlay; GtkInspectorOverlay *layout_overlay; @@ -912,7 +910,6 @@ static gboolean keynav_failed (GtkWidget *widget, GtkDirectionType direction, GtkInspectorVisual *vis) { GtkWidget *next; - gdouble value, lower, upper, page; if (direction == GTK_DIR_DOWN && widget == vis->priv->visual_box) @@ -935,22 +932,6 @@ keynav_failed (GtkWidget *widget, GtkDirectionType direction, GtkInspectorVisual return TRUE; } - value = gtk_adjustment_get_value (vis->priv->focus_adjustment); - lower = gtk_adjustment_get_lower (vis->priv->focus_adjustment); - upper = gtk_adjustment_get_upper (vis->priv->focus_adjustment); - page = gtk_adjustment_get_page_size (vis->priv->focus_adjustment); - - if (direction == GTK_DIR_UP && value > lower) - { - gtk_adjustment_set_value (vis->priv->focus_adjustment, lower); - return TRUE; - } - else if (direction == GTK_DIR_DOWN && value < upper - page) - { - gtk_adjustment_set_value (vis->priv->focus_adjustment, upper - page); - return TRUE; - } - return FALSE; } @@ -1070,10 +1051,6 @@ gtk_inspector_visual_constructed (GObject *object) G_OBJECT_CLASS (gtk_inspector_visual_parent_class)->constructed (object); - vis->priv->focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (vis->priv->swin)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (vis->priv->box), - vis->priv->focus_adjustment); - g_signal_connect (vis->priv->visual_box, "keynav-failed", G_CALLBACK (keynav_failed), vis); g_signal_connect (vis->priv->debug_box, "keynav-failed", G_CALLBACK (keynav_failed), vis); g_signal_connect (vis->priv->misc_box, "keynav-failed", G_CALLBACK (keynav_failed), vis); diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index bbac09de1d..6fcbc2a728 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -29,368 +29,373 @@ never - - vertical - 60 - 60 - 60 - 60 - 10 + + 1 - - center + + vertical + 60 + 60 + 60 + 60 + 10 - - none - + + center - - 0 + + none + - - 10 - 10 - 10 - 10 - 40 + + 0 - - GTK Theme - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + GTK Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Dark Variant - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Dark Variant + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Cursor Theme - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Cursor Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Cursor Size - start - baseline - 0.0 - - - - - end - baseline - 2 - 2 - cursor_size_adjustment - 1 - 1 + + 10 + 10 + 10 + 10 + 40 + + + Cursor Size + start + baseline + 0.0 + + + + + end + baseline + 2 + 2 + cursor_size_adjustment + 1 + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Icon Theme - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Icon Theme + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Font - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Font + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 20 + + 0 - - Font Scale - start - baseline - 0.0 - - - - - baseline - font_scale_adjustment - 0 - 1 - - - - - - - - end - baseline - 4 - number + + 10 + 10 + 10 + 10 + 20 + + + Font Scale + start + baseline + 0.0 + + + + + baseline + font_scale_adjustment + 0 + 1 + + + + + + + + end + baseline + 4 + number + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Text Direction - start - baseline - 0.0 - - - - - end - baseline - 1 - - - Left-to-Right - Right-to-Left - + + 10 + 10 + 10 + 10 + 40 + + + Text Direction + start + baseline + 0.0 + + + + + end + baseline + 1 + + + Left-to-Right + Right-to-Left + + + - - - - - 0 - - 10 - 10 - 10 - 10 - 40 + + 0 - - Window Scaling - start - baseline - 0.0 - - - - - end - baseline - scale_adjustment - 1 - 1 + + 10 + 10 + 10 + 10 + 40 + + + Window Scaling + start + baseline + 0.0 + + + + + end + baseline + scale_adjustment + 1 + 1 + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Animations - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Animations + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - 0 - - 10 - 10 - 10 - 10 - 20 + + 0 - - Slowdown - start - baseline - 0.0 - - - - - slowdown_adjustment - baseline - 0 - 1 - - - - - - - - end - baseline - 4 - number + + 10 + 10 + 10 + 10 + 20 + + + Slowdown + start + baseline + 0.0 + + + + + slowdown_adjustment + baseline + 0 + 1 + + + + + + + + end + baseline + 4 + number + + @@ -399,212 +404,212 @@ - - - - - center - - none - 1 + + center - + + none + 1 - - 10 - 10 - 10 - 10 - 40 + - - Show fps overlay - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show fps overlay + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Graphic Updates - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Graphic Updates + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Fallback Rendering - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Fallback Rendering + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Baselines - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Baselines + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Layout Borders - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Layout Borders + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Widget Resizes - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Widget Resizes + start + baseline + 0.0 + + + + + end + baseline + 1 + + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Show Focus - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Show Focus + start + baseline + 0.0 + + + + + end + baseline + 1 + + + @@ -613,66 +618,66 @@ - - - - - center - - none - 1 + + center - + + none + 1 - - 10 - 10 - 10 - 10 - 40 + - - Simulate Touchscreen - start - baseline - 0.0 - - - - - end - baseline - 1 + + 10 + 10 + 10 + 10 + 40 + + + Simulate Touchscreen + start + baseline + 0.0 + + + + + end + baseline + 1 + + - - - - - - 10 - 10 - 10 - 10 - 40 + - - Software GL - start - baseline - 0.0 - - - - - end - baseline - 1 - + + 10 + 10 + 10 + 10 + 40 + + + Software GL + start + baseline + 0.0 + + + + + end + baseline + 1 + + +