mirror of
https://github.com/ZoiteChat/zoitechat.git
synced 2026-03-17 03:00:19 +00:00
Updated GTK3 handling in setup_create_color_button to align the color button’s child widget without using GtkAlignment, while keeping the GTK2 alignment path intact.
This commit is contained in:
@@ -1812,7 +1812,9 @@ setup_create_color_button (GtkWidget *table, int num, int row, int col)
|
|||||||
GtkWidget *but;
|
GtkWidget *but;
|
||||||
GtkWidget *label;
|
GtkWidget *label;
|
||||||
GtkWidget *box;
|
GtkWidget *box;
|
||||||
|
#if !HAVE_GTK3
|
||||||
GtkWidget *alignment;
|
GtkWidget *alignment;
|
||||||
|
#endif
|
||||||
char buf[64];
|
char buf[64];
|
||||||
|
|
||||||
if (num > 31)
|
if (num > 31)
|
||||||
@@ -1829,17 +1831,17 @@ setup_create_color_button (GtkWidget *table, int num, int row, int col)
|
|||||||
gtk_event_box_set_visible_window (GTK_EVENT_BOX (box), TRUE);
|
gtk_event_box_set_visible_window (GTK_EVENT_BOX (box), TRUE);
|
||||||
gtk_container_add (GTK_CONTAINER (box), label);
|
gtk_container_add (GTK_CONTAINER (box), label);
|
||||||
gtk_container_add (GTK_CONTAINER (but), box);
|
gtk_container_add (GTK_CONTAINER (but), box);
|
||||||
|
#if HAVE_GTK3
|
||||||
|
gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
|
||||||
|
gtk_widget_set_valign (box, GTK_ALIGN_CENTER);
|
||||||
|
#else
|
||||||
alignment = gtk_bin_get_child (GTK_BIN (but));
|
alignment = gtk_bin_get_child (GTK_BIN (but));
|
||||||
if (GTK_IS_ALIGNMENT (alignment))
|
if (GTK_IS_ALIGNMENT (alignment))
|
||||||
{
|
{
|
||||||
#if HAVE_GTK3
|
|
||||||
gtk_widget_set_halign (alignment, GTK_ALIGN_CENTER);
|
|
||||||
gtk_widget_set_valign (alignment, GTK_ALIGN_CENTER);
|
|
||||||
#elif !HAVE_GTK3
|
|
||||||
gtk_alignment_set (GTK_ALIGNMENT (alignment), 0.5, 0.5, 1.0, 1.0);
|
gtk_alignment_set (GTK_ALIGNMENT (alignment), 0.5, 0.5, 1.0, 1.0);
|
||||||
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 0);
|
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 0);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
gtk_widget_show (label);
|
gtk_widget_show (label);
|
||||||
gtk_widget_show (box);
|
gtk_widget_show (box);
|
||||||
/* win32 build uses this to turn off themeing */
|
/* win32 build uses this to turn off themeing */
|
||||||
|
|||||||
Reference in New Issue
Block a user