Mercurial > vim
changeset 23130:5fabd6e0f6f7 v8.2.2111
patch 8.2.2111: GTK: menu background is the same color as the main window
Commit: https://github.com/vim/vim/commit/023fd5d21323fe6dffa080bd20c4d39e1212d353
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 8 20:31:16 2020 +0100
patch 8.2.2111: GTK: menu background is the same color as the main window
Problem: GTK: Menu background is the same color as the main window.
Solution: Fix white space around the test in another way. (closes https://github.com/vim/vim/issues/7437,
closes #7427)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 08 Dec 2020 20:45:04 +0100 |
parents | da3f1953a1c8 |
children | ab80876327c0 |
files | src/gui_gtk_x11.c src/version.c |
diffstat | 2 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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 +#if GTK_CHECK_VERSION(3,22,2) + gtk_widget_set_name(gui.formwin, "vim-gtk-form"); +#endif 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) gui.surface = NULL; gui.by_signal = FALSE; @@ -4031,18 +4031,18 @@ set_cairo_source_rgba_from_color(cairo_t 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,