3 Commits

Author SHA1 Message Date
c0119cc57e Fix KDE Wayland headerbar button layout 2026-03-22 13:20:55 -06:00
aead92d9e4 Bump to 2.18.0~pre5 + changelog/AppStream 2026-03-22 11:48:57 -06:00
deepend-tildeclub
7cc5d14045 Merge pull request #146 from ZoiteChat/theme-fixes
Apply app theme CSS to menubar everywhere
2026-03-22 11:21:24 -06:00

View File

@@ -394,18 +394,15 @@ theme_manager_handle_theme_applied (void)
static gboolean static gboolean
theme_manager_is_kde_wayland (void) theme_manager_is_kde_wayland (void)
{ {
const char *wayland_display;
const char *desktop; const char *desktop;
char *desktop_lower; char *desktop_lower;
gboolean is_kde; gboolean is_kde;
wayland_display = g_getenv ("WAYLAND_DISPLAY");
if (!wayland_display || !wayland_display[0])
return FALSE;
desktop = g_getenv ("XDG_CURRENT_DESKTOP"); desktop = g_getenv ("XDG_CURRENT_DESKTOP");
if (!desktop || !desktop[0]) if (!desktop || !desktop[0])
desktop = g_getenv ("XDG_SESSION_DESKTOP"); desktop = g_getenv ("XDG_SESSION_DESKTOP");
if ((!desktop || !desktop[0]) && g_getenv ("KDE_FULL_SESSION"))
return TRUE;
if (!desktop || !desktop[0]) if (!desktop || !desktop[0])
return FALSE; return FALSE;
@@ -441,7 +438,7 @@ theme_manager_apply_wayland_kde_csd (GtkWidget *window)
headerbar = gtk_header_bar_new (); headerbar = gtk_header_bar_new ();
gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE); gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (headerbar), "menu:minimize,maximize,close"); gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (headerbar), ":minimize,maximize,close");
icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.svg", 32, 32, TRUE, NULL); icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.svg", 32, 32, TRUE, NULL);
if (!icon_pixbuf) if (!icon_pixbuf)
icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.png", 32, 32, TRUE, NULL); icon_pixbuf = gdk_pixbuf_new_from_resource_at_scale ("/icons/zoitechat.png", 32, 32, TRUE, NULL);