# HG changeset patch # User Bram Moolenaar # Date 1607526003 -3600 # Node ID b78b8c804af02b0928b14f117d23b334963fa9cc # Parent 80157dd8449922498dd046c02acbd933a9376550 patch 8.2.2119: GTK3: status line background color is wrong Commit: https://github.com/vim/vim/commit/7988a6f0e9999d1103271024ab4ed26e5599de17 Author: Bram Moolenaar Date: Wed Dec 9 15:53:27 2020 +0100 patch 8.2.2119: GTK3: status line background color is wrong Problem: GTK3: status line background color is wrong. Solution: Don't change the code for earlier GTK3 versions. (closes https://github.com/vim/vim/issues/7444) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4031,15 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t void gui_mch_new_colors(void) { - if (gui.formwin != NULL && gtk_widget_get_window(gui.formwin) != NULL) + if (gui.drawarea != NULL +#if GTK_CHECK_VERSION(3,22,2) + && gui.formwin != NULL +#endif + && gtk_widget_get_window(gui.drawarea) != NULL) { #if !GTK_CHECK_VERSION(3,22,2) - GdkWindow * const da_win = gtk_widget_get_window(gui.formwin); + GdkWindow * const da_win = gtk_widget_get_window(gui.drawarea); #endif - #if GTK_CHECK_VERSION(3,22,2) - GtkStyleContext * const context - = gtk_widget_get_style_context(gui.formwin); + GtkStyleContext * const context = + gtk_widget_get_style_context(gui.formwin); GtkCssProvider * const provider = gtk_css_provider_new(); gchar * const css = g_strdup_printf( "widget#vim-gtk-form {\n" diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2119, +/**/ 2118, /**/ 2117,