diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 18cf575252..da416cc721 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -80,11 +80,9 @@ struct _GtkInspectorVisual GtkWidget *cursor_size_spin; GtkWidget *direction_combo; GtkWidget *font_button; - GtkWidget *hidpi_spin; GtkWidget *animation_switch; GtkWidget *font_scale_entry; GtkAdjustment *font_scale_adjustment; - GtkAdjustment *scale_adjustment; GtkAdjustment *slowdown_adjustment; GtkWidget *slowdown_entry; GtkAdjustment *cursor_size_adjustment; @@ -861,7 +859,7 @@ init_cursor_size (GtkInspectorVisual *vis) if (size == 0) size = 32; - gtk_adjustment_set_value (vis->scale_adjustment, (double)size); + gtk_adjustment_set_value (vis->cursor_size_adjustment, (double)size); g_signal_connect (vis->cursor_size_adjustment, "value-changed", G_CALLBACK (cursor_size_changed), vis); } @@ -925,61 +923,6 @@ init_font_scale (GtkInspectorVisual *vis) G_CALLBACK (font_scale_entry_activated), vis); } -#if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_BROADWAY) -static void -scale_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis) -{ - int scale; - - scale = gtk_adjustment_get_value (adjustment); -#if defined (GDK_WINDOWING_X11) - if (GDK_IS_X11_DISPLAY (vis->display)) - gdk_x11_display_set_surface_scale (vis->display, scale); -#endif -#if defined (GDK_WINDOWING_BROADWAY) - if (GDK_IS_BROADWAY_DISPLAY (vis->display)) - gdk_broadway_display_set_surface_scale (vis->display, scale); -#endif -} -#endif - -static void -init_scale (GtkInspectorVisual *vis) -{ -#if defined (GDK_WINDOWING_X11) - if (GDK_IS_X11_DISPLAY (vis->display)) - { - double scale; - - scale = gdk_monitor_get_scale_factor (gdk_x11_display_get_primary_monitor (vis->display)); - gtk_adjustment_set_value (vis->scale_adjustment, scale); - g_signal_connect (vis->scale_adjustment, "value-changed", - G_CALLBACK (scale_changed), vis); - } - else -#endif -#if defined (GDK_WINDOWING_BROADWAY) - if (GDK_IS_BROADWAY_DISPLAY (vis->display)) - { - int scale; - - scale = gdk_broadway_display_get_surface_scale (vis->display); - gtk_adjustment_set_value (vis->scale_adjustment, scale); - g_signal_connect (vis->scale_adjustment, "value-changed", - G_CALLBACK (scale_changed), vis); - } - else -#endif - { - GtkWidget *row; - - gtk_adjustment_set_value (vis->scale_adjustment, 1); - gtk_widget_set_sensitive (vis->hidpi_spin, FALSE); - row = gtk_widget_get_ancestor (vis->hidpi_spin, GTK_TYPE_LIST_BOX_ROW); - gtk_widget_set_tooltip_text (row, _("Backend does not support window scaling")); - } -} - static void init_animation (GtkInspectorVisual *vis) { @@ -1224,8 +1167,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass) gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, cursor_size_spin); gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, cursor_size_adjustment); gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, icon_combo); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, hidpi_spin); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, scale_adjustment); gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, animation_switch); gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, slowdown_adjustment); gtk_widget_class_bind_template_child (widget_class, GtkInspectorVisual, slowdown_entry); @@ -1271,7 +1212,6 @@ gtk_inspector_visual_set_display (GtkInspectorVisual *vis, init_cursor_size (vis); init_font (vis); init_font_scale (vis); - init_scale (vis); init_animation (vis); init_slowdown (vis); init_gl (vis); diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index 032d0f4c06..c9c6c4cf65 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -267,40 +267,6 @@ - - - 0 - - - 40 - - - Window Scaling - start - baseline - 0.0 - - - - - end - baseline - - - 1 - 3 - 1 - 1 - - - 1 - 1 - - - - - - @@ -721,7 +687,6 @@ -