AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 23:50:16 +00:00
Code Issues Projects Releases Wiki Activity

inspector: Improve monitor information display

Browse Source 
Avoid a nested listbox, show the connector,
don't show information we don't have. Also,
disconnect all signal handlers from the display
when the inspector is going away.
This commit is contained in:
Matthias Clasen 2021-05-02 20:47:09 -04:00
parent 6a5f93ff95
commit d9784df92e
1 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
gtk/inspector/general.c
View File

@ -568,26 +568,23 @@ populate_display (GdkDisplay *display, GtkInspectorGeneral *gen)
gdk_display_is_composited (display));
}
static GtkWidget *
populate_monitor (gpointer item,
gpointer gen)
static void
add_monitor (GtkInspectorGeneral *gen,
GdkMonitor *monitor,
guint i)
{
GtkListBox *list;
GdkMonitor *monitor = item;
char *name;
char *value;
GdkRectangle rect;
int scale;
char *name;
char *scale_str = NULL;
const char *manufacturer;
const char *model;
list = GTK_LIST_BOX (gtk_list_box_new ());
gtk_widget_add_css_class (GTK_WIDGET (list), "rich-list");
gtk_list_box_set_selection_mode (list, GTK_SELECTION_NONE);
list = GTK_LIST_BOX (gen->monitor_box);
/* XXX: add monitor # here when porting to listview */
name = g_strdup_printf ("Monitor %d", 1);
name = g_strdup_printf ("Monitor %u", i);
manufacturer = gdk_monitor_get_manufacturer (monitor);
model = gdk_monitor_get_model (monitor);
value = g_strdup_printf ("%s%s%s",
@ -595,13 +592,15 @@ populate_monitor (gpointer item,
manufacturer || model ? " " : "",
model ? model : "");
add_label_row (gen, list, name, value, 0);
g_free (name);
g_free (value);
g_free (name);
add_label_row (gen, list, "Connector", gdk_monitor_get_connector (monitor), 10);
gdk_monitor_get_geometry (monitor, &rect);
scale = gdk_monitor_get_scale_factor (monitor);
if (scale != 1)
scale_str = g_strdup_printf (" @ %d", scale);
scale_str = g_strdup_printf (" @ %d", scale);
value = g_strdup_printf ("%d × %d%s at %d, %d",
rect.width, rect.height,
@ -611,25 +610,46 @@ populate_monitor (gpointer item,
g_free (value);
g_free (scale_str);
value = g_strdup_printf ("%d × %d mm²",
value = g_strdup_printf ("%d × %d mm²",
gdk_monitor_get_width_mm (monitor),
gdk_monitor_get_height_mm (monitor));
add_label_row (gen, list, "Size", value, 10);
g_free (value);
if (gdk_monitor_get_refresh_rate (monitor) != 0)
value = g_strdup_printf ("%.2f Hz",
0.001 * gdk_monitor_get_refresh_rate (monitor));
else
value = g_strdup ("unknown");
add_label_row (gen, list, "Refresh rate", value, 10);
g_free (value);
{
value = g_strdup_printf ("%.2f Hz",
0.001 * gdk_monitor_get_refresh_rate (monitor));
add_label_row (gen, list, "Refresh rate", value, 10);
g_free (value);
}
value = g_strdup (translate_subpixel_layout (gdk_monitor_get_subpixel_layout (monitor)));
add_label_row (gen, list, "Subpixel layout", value, 10);
g_free (value);
if (gdk_monitor_get_subpixel_layout (monitor) != GDK_SUBPIXEL_LAYOUT_UNKNOWN)
{
add_label_row (gen, list, "Subpixel layout",
translate_subpixel_layout (gdk_monitor_get_subpixel_layout (monitor)),
10);
}
}
return GTK_WIDGET (list);
static void
populate_monitors (GdkDisplay *display,
GtkInspectorGeneral *gen)
{
GtkWidget *child;
GListModel *list;
while ((child = gtk_widget_get_first_child (gen->monitor_box)))
gtk_list_box_remove (GTK_LIST_BOX (gen->monitor_box), child);
list = gdk_display_get_monitors (gen->display);
for (guint i = 0; i < g_list_model_get_n_items (list); i++)
{
GdkMonitor *monitor = g_list_model_get_item (list, i);
add_monitor (gen, monitor, i);
g_object_unref (monitor);
}
}
static void
@ -640,16 +660,25 @@ populate_display_notify_cb (GdkDisplay *display,
populate_display (display, gen);
}
static void
monitors_changed_cb (GListModel *monitors,
guint position,
guint removed,
guint added,
GtkInspectorGeneral *gen)
{
populate_monitors (gen->display, gen);
}
static void
init_display (GtkInspectorGeneral *gen)
{
g_signal_connect (gen->display, "notify", G_CALLBACK (populate_display_notify_cb), gen);
gtk_list_box_bind_model (GTK_LIST_BOX (gen->monitor_box),
gdk_display_get_monitors (gen->display),
populate_monitor,
gen, NULL);
g_signal_connect (gdk_display_get_monitors (gen->display), "items-changed",
G_CALLBACK (monitors_changed_cb), gen);
populate_display (gen->display, gen);
populate_monitors (gen->display, gen);
}
static void
@ -953,6 +982,8 @@ gtk_inspector_general_dispose (GObject *object)
g_signal_handlers_disconnect_by_func (gen->display, G_CALLBACK (seat_added), gen);
g_signal_handlers_disconnect_by_func (gen->display, G_CALLBACK (seat_removed), gen);
g_signal_handlers_disconnect_by_func (gen->display, G_CALLBACK (populate_display_notify_cb), gen);
g_signal_handlers_disconnect_by_func (gdk_display_get_monitors (gen->display), G_CALLBACK (monitors_changed_cb), gen);
list = gdk_display_list_seats (gen->display);
for (l = list; l; l = l->next)