Skip to content

Commit 7988a6f

Browse files
committed
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 #7444)
1 parent f46bf52 commit 7988a6f

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/gui_gtk_x11.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4031,15 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t *cr, guicolor_T color)
40314031
void
40324032
gui_mch_new_colors(void)
40334033
{
4034-
if (gui.formwin != NULL && gtk_widget_get_window(gui.formwin) != NULL)
4034+
if (gui.drawarea != NULL
4035+
#if GTK_CHECK_VERSION(3,22,2)
4036+
&& gui.formwin != NULL
4037+
#endif
4038+
&& gtk_widget_get_window(gui.drawarea) != NULL)
40354039
{
40364040
#if !GTK_CHECK_VERSION(3,22,2)
4037-
GdkWindow * const da_win = gtk_widget_get_window(gui.formwin);
4041+
GdkWindow * const da_win = gtk_widget_get_window(gui.drawarea);
40384042
#endif
4039-
40404043
#if GTK_CHECK_VERSION(3,22,2)
4041-
GtkStyleContext * const context
4042-
= gtk_widget_get_style_context(gui.formwin);
4044+
GtkStyleContext * const context =
4045+
gtk_widget_get_style_context(gui.formwin);
40434046
GtkCssProvider * const provider = gtk_css_provider_new();
40444047
gchar * const css = g_strdup_printf(
40454048
"widget#vim-gtk-form {\n"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2119,
753755
/**/
754756
2118,
755757
/**/

0 commit comments

Comments
 (0)