From 91cdc288465e248e49740032cad0dec2f5ed53c1 Mon Sep 17 00:00:00 2001 From: deepend Date: Mon, 19 Jan 2026 19:37:03 -0700 Subject: [PATCH] Added a chanlist label alignment helper and reused it for the filter labels to keep GTK3/GTK2 alignment behavior consistent. Added a main GUI alignment helper and applied it to the quit dialog label alignment path for GTK3/GTK2 compatibility --- src/fe-gtk/chanlist.c | 27 +++++++++++++++------------ src/fe-gtk/maingui.c | 15 ++++++++++++--- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index a8ed5b71..f6bc0465 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -68,6 +68,17 @@ chanlistrow; #define GET_MODEL(xserv) (gtk_tree_view_get_model(GTK_TREE_VIEW(xserv->gui->chanlist_list))) +static void +chanlist_set_label_alignment (GtkWidget *widget) +{ +#if HAVE_GTK3 + gtk_widget_set_halign (widget, GTK_ALIGN_START); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#else + gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5); +#endif +} + static gboolean chanlist_match (server *serv, const char *str) @@ -839,12 +850,10 @@ chanlist_opengui (server *serv, int do_refresh) /* ============================================================= */ wid = gtk_label_new (_("Show only:")); + chanlist_set_label_alignment (wid); #if HAVE_GTK3 - gtk_widget_set_halign (wid, GTK_ALIGN_START); - gtk_widget_set_valign (wid, GTK_ALIGN_CENTER); gtk_grid_attach (GTK_GRID (table), wid, 0, 3, 1, 1); #else - gtk_misc_set_alignment (GTK_MISC (wid), 0, 0.5); gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); #endif @@ -897,12 +906,10 @@ chanlist_opengui (server *serv, int do_refresh) /* ============================================================= */ wid = gtk_label_new (_("Look in:")); + chanlist_set_label_alignment (wid); #if HAVE_GTK3 - gtk_widget_set_halign (wid, GTK_ALIGN_START); - gtk_widget_set_valign (wid, GTK_ALIGN_CENTER); gtk_grid_attach (GTK_GRID (table), wid, 0, 2, 1, 1); #else - gtk_misc_set_alignment (GTK_MISC (wid), 0, 0.5); gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); #endif @@ -944,12 +951,10 @@ chanlist_opengui (server *serv, int do_refresh) /* ============================================================= */ wid = gtk_label_new (_("Search type:")); + chanlist_set_label_alignment (wid); #if HAVE_GTK3 - gtk_widget_set_halign (wid, GTK_ALIGN_START); - gtk_widget_set_valign (wid, GTK_ALIGN_CENTER); gtk_grid_attach (GTK_GRID (table), wid, 0, 1, 1, 1); #else - gtk_misc_set_alignment (GTK_MISC (wid), 0, 0.5); gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); #endif @@ -973,12 +978,10 @@ chanlist_opengui (server *serv, int do_refresh) /* ============================================================= */ wid = gtk_label_new (_("Find:")); + chanlist_set_label_alignment (wid); #if HAVE_GTK3 - gtk_widget_set_halign (wid, GTK_ALIGN_START); - gtk_widget_set_valign (wid, GTK_ALIGN_CENTER); gtk_grid_attach (GTK_GRID (table), wid, 0, 0, 1, 1); #else - gtk_misc_set_alignment (GTK_MISC (wid), 0, 0.5); gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); #endif diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 0f1b587a..d782e65d 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -102,6 +102,17 @@ mg_color_component_to_pango (double value) return (guint16)(value * 65535.0 + 0.5); } +static void +mg_set_label_alignment_start (GtkWidget *widget) +{ +#if HAVE_GTK3 + gtk_widget_set_halign (widget, GTK_ALIGN_START); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); +#else + gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5); +#endif +} + static void mg_pixbuf_destroy (guchar *pixels, gpointer data) { @@ -1383,17 +1394,15 @@ mg_open_quit_dialog (gboolean minimize_button) label = gtk_label_new (text); g_free (text); gtk_widget_show (label); + mg_set_label_alignment_start (label); #if HAVE_GTK3 gtk_grid_attach (GTK_GRID (table1), label, 1, 0, 1, 1); gtk_widget_set_hexpand (label, TRUE); gtk_widget_set_vexpand (label, TRUE); - gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); #else gtk_table_attach (GTK_TABLE (table1), label, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); #endif gtk_label_set_use_markup (GTK_LABEL (label), TRUE);