thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2111: GTK: menu background is the same color as the main window

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2020-12-08 20:31:16 +01:00
parent 8e1cbb55c3
commit 023fd5d213
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui_gtk_x11.c
View File

@@ -3816,11 +3816,11 @@ gui_mch_init(void)
#if !GTK_CHECK_VERSION(3,0,0) #if !GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK); gtk_widget_set_events(gui.formwin, GDK_EXPOSURE_MASK);
#endif #endif
#if GTK_CHECK_VERSION(3,22,2)
gtk_widget_set_name(gui.formwin, "vim-gtk-form");
#endif
gui.drawarea = gtk_drawing_area_new(); gui.drawarea = gtk_drawing_area_new();
#if GTK_CHECK_VERSION(3,22,2)
gtk_widget_set_name(gui.drawarea, "vim-gui-drawarea");
#endif
#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,0,0)
gui.surface = NULL; gui.surface = NULL;
gui.by_signal = FALSE; gui.by_signal = FALSE;
@@ -4031,18 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t *cr, guicolor_T color)
void void
gui_mch_new_colors(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) #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 #endif
#if GTK_CHECK_VERSION(3,22,2) #if GTK_CHECK_VERSION(3,22,2)
GtkStyleContext * const context GtkStyleContext * const context
= gtk_widget_get_style_context(gui.mainwin); = gtk_widget_get_style_context(gui.formwin);
GtkCssProvider * const provider = gtk_css_provider_new(); GtkCssProvider * const provider = gtk_css_provider_new();
gchar * const css = g_strdup_printf( 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" " background-color: #%.2lx%.2lx%.2lx;\n"
"}\n", "}\n",
(gui.back_pixel >> 16) & 0xff, (gui.back_pixel >> 16) & 0xff,

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2111,
/**/ /**/
2110, 2110,
/**/ /**/