From dc1af406c56750425fa8b33c31463cc63df2492e Mon Sep 17 00:00:00 2001 From: c4pp4 Date: Mon, 13 Apr 2026 23:55:28 +0200 Subject: [PATCH 1/1] Fix HdyHeaderBar widget Avoid unwanted black frame when using HdyHeaderBar widget and remove HdyHeaderBar rounded top corners. (e.g. gnome-screenshot-41.0) Signed-off-by: c4pp4 --- gtk3-nocsd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gtk3-nocsd.c b/gtk3-nocsd.c index 8b4e3c3..b0500f5 100644 --- a/gtk3-nocsd.c +++ b/gtk3-nocsd.c @@ -263,7 +263,7 @@ RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_header_bar_set_decoration_layout, vo RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_header_bar_get_decoration_layout, const gchar *, (GtkHeaderBar *bar), (bar)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_style_context_add_class, void, (GtkStyleContext *context, const gchar *class_name), (context, class_name)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_style_context_remove_class, void, (GtkStyleContext *context, const gchar *class_name), (context, class_name)) -RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_style_context_add_provider, void, (GtkStyleContext *context, GtkStyleProvider *provider, guint priority), (context, provider, priority)) +RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_style_context_add_provider_for_screen, void, (GdkScreen *screen, GtkStyleProvider *provider, guint priority), (screen, provider, priority)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_style_provider_get_type, GType, (), ()) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_destroy, void, (GtkWidget *widget), (widget)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_get_mapped, gboolean, (GtkWidget *widget), (widget)) @@ -275,6 +275,7 @@ RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_unrealize, void, (GtkWidget * RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_realize, void, (GtkWidget *widget), (widget)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_get_settings, GtkSettings *, (GtkWidget *widget), (widget)) RUNTIME_IMPORT_FUNCTION(0, GTK_LIBRARY, gtk_widget_get_toplevel, GtkWidget *, (GtkWidget *widget), (widget)) +RUNTIME_IMPORT_FUNCTION(0, GDK_LIBRARY, gdk_screen_get_default, GdkScreen *, (), ()) RUNTIME_IMPORT_FUNCTION(0, GDK_LIBRARY, gdk_window_get_user_data, void, (GdkWindow *window, gpointer *data), (window, data)) RUNTIME_IMPORT_FUNCTION(1, GDK_LIBRARY, gdk_screen_is_composited, gboolean, (GdkScreen *screen), (screen)) RUNTIME_IMPORT_FUNCTION(1, GDK_LIBRARY, gdk_window_set_decorations, void, (GdkWindow *window, GdkWMDecoration decorations), (window, decorations)) @@ -329,7 +330,7 @@ RUNTIME_IMPORT_FUNCTION(0, GIREPOSITORY_LIBRARY, g_function_info_prep_invoker, g #define orig_gtk_header_bar_get_decoration_layout rtlookup_gtk_header_bar_get_decoration_layout #define gtk_style_context_add_class rtlookup_gtk_style_context_add_class #define gtk_style_context_remove_class rtlookup_gtk_style_context_remove_class -#define gtk_style_context_add_provider rtlookup_gtk_style_context_add_provider +#define gtk_style_context_add_provider_for_screen rtlookup_gtk_style_context_add_provider_for_screen #define gtk_style_provider_get_type rtlookup_gtk_style_provider_get_type #define gtk_widget_destroy rtlookup_gtk_widget_destroy #define gtk_widget_get_mapped rtlookup_gtk_widget_get_mapped @@ -339,6 +340,7 @@ RUNTIME_IMPORT_FUNCTION(0, GIREPOSITORY_LIBRARY, g_function_info_prep_invoker, g #define gtk_widget_set_parent rtlookup_gtk_widget_set_parent #define gtk_widget_unrealize rtlookup_gtk_widget_unrealize #define gtk_widget_realize rtlookup_gtk_widget_realize +#define gdk_screen_get_default rtlookup_gdk_screen_get_default #define gdk_window_get_user_data rtlookup_gdk_window_get_user_data #define orig_gdk_screen_is_composited rtlookup_gdk_screen_is_composited #define orig_gdk_window_set_decorations rtlookup_gdk_window_set_decorations @@ -542,7 +544,14 @@ static GtkStyleProvider *get_custom_css_provider () " border-style: none;\n" " border-color: transparent;\n" "}\n" + "decoration {\n" + " margin: 0;\n" + "}\n" + ".background.csd decoration {\n" + " margin: 10px;\n" + "}\n" ".background:not(.tiled):not(.maximized) .titlebar:backdrop,\n" + ".background:not(.tiled):not(.maximized):not(.solid-csd) headerbar.titlebar,\n" ".background:not(.tiled):not(.maximized) .titlebar {\n" " border-top-left-radius: 0;\n" " border-top-right-radius: 0;\n" @@ -571,16 +580,16 @@ static GtkStyleProvider *get_custom_css_provider () static void add_custom_css (GtkWidget *widget) { - GtkStyleContext *context = gtk_widget_get_style_context (widget); GtkStyleProvider *my_provider = get_custom_css_provider (); - if (!context || !my_provider) + if (!my_provider) return; /* Use a higher priority than SETTINGS, but lower than APPLICATION. * add_provider will make sure a given provider is not added twice. */ - gtk_style_context_add_provider (context, my_provider, GTK_STYLE_PROVIDER_PRIORITY_SETTINGS + 50); + GdkScreen *screen = gdk_screen_get_default (); + gtk_style_context_add_provider_for_screen (screen, my_provider, GTK_STYLE_PROVIDER_PRIORITY_SETTINGS + 50); } // This API exists since gtk+ 3.10 -- 2.52.0