From f97180beeee1c78267343f88a83db60aae70f027 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Apr 2020 09:17:46 -0400 Subject: [PATCH] inspector: Show scales other than 2 We were hardcoding that monitor scales can only be 1 or 2. Not true. --- gtk/inspector/general.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 2d3e0ef001..1f50020bfc 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -549,6 +549,7 @@ populate_display (GdkDisplay *display, GtkInspectorGeneral *gen) gchar *value; GdkRectangle rect; gint scale; + char *scale_str = NULL; const char *manufacturer; const char *model; GdkMonitor *monitor; @@ -568,13 +569,16 @@ populate_display (GdkDisplay *display, GtkInspectorGeneral *gen) gdk_monitor_get_geometry (monitor, &rect); scale = gdk_monitor_get_scale_factor (monitor); + if (scale != 1) + scale_str = g_strdup_printf (" @ %d", scale); value = g_strdup_printf ("%d × %d%s at %d, %d", rect.width, rect.height, - scale == 2 ? " @ 2" : "", + scale_str ? scale_str : "", rect.x, rect.y); add_label_row (gen, list, "Geometry", value, 10); g_free (value); + g_free (scale_str); value = g_strdup_printf ("%d × %d mm²", gdk_monitor_get_width_mm (monitor),