summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-08 20:31:16 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-08 20:31:16 +0100
commit023fd5d21323fe6dffa080bd20c4d39e1212d353 (patch)
tree80b140bfaed8f1a8d1294aa7336e74d1e53e0b5d
parent8e1cbb55c389bdc4eade7a67309d5042fbcdca7d (diff)
downloadvim-git-023fd5d21323fe6dffa080bd20c4d39e1212d353.tar.gz
patch 8.2.2111: GTK: menu background is the same color as the main windowv8.2.2111
Problem: GTK: Menu background is the same color as the main window. Solution: Fix white space around the test in another way. (closes #7437, closes #7427)
-rw-r--r--src/gui_gtk_x11.c14
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index e06bfd7f7..22788e84b 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3816,11 +3816,11 @@ gui_mch_init(void)
#if !GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK);
#endif
-
- gui.drawarea = gtk_drawing_area_new();
#if GTK_CHECK_VERSION(3,22,2)
- gtk_widget_set_name(gui.drawarea, "vim-gui-drawarea");
+ gtk_widget_set_name(gui.formwin, "vim-gtk-form");
#endif
+
+ gui.drawarea = gtk_drawing_area_new();
#if GTK_CHECK_VERSION(3,0,0)
gui.surface = NULL;
gui.by_signal = FALSE;
@@ -4031,18 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t *cr, guicolor_T color)
void
gui_mch_new_colors(void)
{
- if (gui.drawarea != NULL && gtk_widget_get_window(gui.drawarea) != NULL)
+ if (gui.formwin != NULL && gtk_widget_get_window(gui.formwin) != NULL)
{
#if !GTK_CHECK_VERSION(3,22,2)
- GdkWindow * const da_win = gtk_widget_get_window(gui.drawarea);
+ GdkWindow * const da_win = gtk_widget_get_window(gui.formwin);
#endif
#if GTK_CHECK_VERSION(3,22,2)
GtkStyleContext * const context
- = gtk_widget_get_style_context(gui.mainwin);
+ = gtk_widget_get_style_context(gui.formwin);
GtkCssProvider * const provider = gtk_css_provider_new();
gchar * const css = g_strdup_printf(
- "widget#vim-gui-drawarea, #vim-main-window {\n"
+ "widget#vim-gtk-form {\n"
" background-color: #%.2lx%.2lx%.2lx;\n"
"}\n",
(gui.back_pixel >> 16) & 0xff,
diff --git a/src/version.c b/src/version.c
index 6580dbd83..07dc6a20d 100644
--- 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 */
/**/
+ 2111,
+/**/
2110,
/**/
2109,