deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-12 16:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched palette type selection and color conversion helpers to use the HAVE_GTK3 guard consistently in palette definitions and helpers.

Browse Source 
Updated GTK3-specific palette color storage handling in DCC, notify, and user list views to align with HAVE_GTK3 guards.
Standardized setup color application and dialog logic to use HAVE_GTK3 branches for GTK3/GTK2 separation.
This commit is contained in:
deepend
2026-01-31 13:38:05 -07:00
parent d314856f82
commit 1fb1865aca
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fe-gtk/setup.c
View File

@@ -1692,7 +1692,7 @@ setup_color_button_apply (GtkWidget *button, const PaletteColor *color)
{
GtkWidget *target = g_object_get_data (G_OBJECT (button), "zoitechat-color-box");
GtkWidget *apply_widget = GTK_IS_WIDGET (target) ? target : button;
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
GtkStateFlags states[] = {
GTK_STATE_FLAG_NORMAL,
GTK_STATE_FLAG_PRELIGHT,
@@ -1712,7 +1712,7 @@ setup_color_button_apply (GtkWidget *button, const PaletteColor *color)
guint i;
for (i = 0; i < G_N_ELEMENTS (states); i++)
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
gtk_widget_override_background_color (apply_widget, states[i], color);
#else
gtk_widget_modify_bg (apply_widget, states[i], color);
@@ -1720,7 +1720,7 @@ setup_color_button_apply (GtkWidget *button, const PaletteColor *color)
if (apply_widget != button)
for (i = 0; i < G_N_ELEMENTS (states); i++)
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
gtk_widget_override_background_color (button, states[i], color);
#else
gtk_widget_modify_bg (button, states[i], color);
@@ -1729,7 +1729,7 @@ setup_color_button_apply (GtkWidget *button, const PaletteColor *color)
gtk_widget_queue_draw (button);
}
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
typedef struct
{
GtkWidget *button;
@@ -1812,7 +1812,7 @@ setup_color_ok_cb (GtkWidget *button, GtkWidget *dialog)
static void
setup_color_cb (GtkWidget *button, gpointer userdata)
{
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
GtkWidget *dialog;
PaletteColor *color;
GdkRGBA rgba;
@@ -2802,7 +2802,7 @@ setup_create_tree (GtkWidget *box, GtkWidget *book)
static void
setup_apply_entry_style (GtkWidget *entry)
{
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
gtk_widget_override_background_color (entry, GTK_STATE_FLAG_NORMAL, &colors[COL_BG]);
gtk_widget_override_color (entry, GTK_STATE_FLAG_NORMAL, &colors[COL_FG]);
gtk_widget_override_font (entry, input_style->font_desc);
@@ -2828,7 +2828,7 @@ setup_apply_to_sess (session_gui *gui)
#endif
}
#if GTK_CHECK_VERSION(3,0,0)
#if HAVE_GTK3
if (prefs.hex_gui_ulist_style || fe_dark_mode_is_enabled ())
{
gtk_widget_override_background_color (gui->user_tree, GTK_STATE_FLAG_NORMAL, &colors[COL_BG]);