From 1406eec1976ffbf5d89b114c8d17cc0088313457 Mon Sep 17 00:00:00 2001 From: deepend Date: Fri, 30 Jan 2026 17:48:25 -0700 Subject: [PATCH] =?UTF-8?q?Updated=20server=20list=20UI=20to=20use=20GTK3?= =?UTF-8?q?=20vertical=20button=20boxes=20and=20horizontal=20separators=20?= =?UTF-8?q?behind=20GTK3=20guards=20while=20keeping=20GTK2=20constructors?= =?UTF-8?q?=20under=20#if=20!HAVE=5FGTK3.=20Swapped=20the=20vertical=20tab?= =?UTF-8?q?=20separator=20to=20GTK3=E2=80=99s=20horizontal=20separator=20u?= =?UTF-8?q?nder=20#if=20HAVE=5FGTK3,=20preserving=20the=20GTK2=20construct?= =?UTF-8?q?or=20for=20non-GTK3=20builds.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fe-gtk/chanview-tabs.c | 4 ++++ src/fe-gtk/servlistgui.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c index 1a2081cd..22caeca8 100644 --- a/src/fe-gtk/chanview-tabs.c +++ b/src/fe-gtk/chanview-tabs.c @@ -526,7 +526,11 @@ tab_add_real (chanview *cv, GtkWidget *tab, chan *ch) #elif !HAVE_GTK3 box = gtk_vbox_new (FALSE, 0); #endif +#if HAVE_GTK3 + sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); +#elif !HAVE_GTK3 sep = gtk_hseparator_new (); +#endif } else { /* horiz */ diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index adc7d69b..bb89775e 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1996,7 +1996,11 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) /* Button Box */ +#if HAVE_GTK3 + vbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); +#elif !HAVE_GTK3 vbuttonbox1 = gtk_vbutton_box_new (); +#endif gtk_box_set_spacing (GTK_BOX (vbuttonbox1), 3); gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox1), GTK_BUTTONBOX_START); gtk_box_pack_start (GTK_BOX (hbox1), vbuttonbox1, FALSE, FALSE, 3); @@ -2103,7 +2107,11 @@ servlist_open_edit (GtkWidget *parent, ircnet *net) /* Rule and Close button */ +#if HAVE_GTK3 + hseparator2 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); +#elif !HAVE_GTK3 hseparator2 = gtk_hseparator_new (); +#endif gtk_box_pack_start (GTK_BOX (vbox5), hseparator2, FALSE, FALSE, 8); #if HAVE_GTK3 @@ -2407,7 +2415,11 @@ servlist_open_networks (void) G_CALLBACK (fav_servlist), 0); gtk_widget_show (checkbutton_fav); +#if HAVE_GTK3 + vbuttonbox2 = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); +#elif !HAVE_GTK3 vbuttonbox2 = gtk_vbutton_box_new (); +#endif gtk_box_set_spacing (GTK_BOX (vbuttonbox2), 3); gtk_button_box_set_layout (GTK_BUTTON_BOX (vbuttonbox2), GTK_BUTTONBOX_START); gtk_widget_show (vbuttonbox2); @@ -2464,7 +2476,11 @@ servlist_open_networks (void) gtk_container_add (GTK_CONTAINER (vbuttonbox2), button_sort); gtk_widget_set_can_default (button_sort, TRUE); +#if HAVE_GTK3 + hseparator1 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); +#elif !HAVE_GTK3 hseparator1 = gtk_hseparator_new (); +#endif gtk_widget_show (hseparator1); gtk_box_pack_start (GTK_BOX (vbox1), hseparator1, FALSE, TRUE, 4);