To: vim_dev@googlegroups.com
Subject: Patch 8.2.2111
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.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)
Files:      src/gui_gtk_x11.c


*** ../vim-8.2.2110/src/gui_gtk_x11.c	2020-11-25 12:25:42.919981195 +0100
--- src/gui_gtk_x11.c	2020-12-08 20:27:51.260262920 +0100
***************
*** 3816,3826 ****
  #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");
  #endif
  #if GTK_CHECK_VERSION(3,0,0)
      gui.surface = NULL;
      gui.by_signal = FALSE;
--- 3816,3826 ----
  #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,0,0)
      gui.surface = NULL;
      gui.by_signal = FALSE;
***************
*** 4031,4048 ****
      void
  gui_mch_new_colors(void)
  {
!     if (gui.drawarea != NULL && gtk_widget_get_window(gui.drawarea) != NULL)
      {
  #if !GTK_CHECK_VERSION(3,22,2)
! 	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.mainwin);
  	GtkCssProvider * const provider = gtk_css_provider_new();
  	gchar * const css = g_strdup_printf(
! 		"widget#vim-gui-drawarea, #vim-main-window {\n"
  		"  background-color: #%.2lx%.2lx%.2lx;\n"
  		"}\n",
  		 (gui.back_pixel >> 16) & 0xff,
--- 4031,4048 ----
      void
  gui_mch_new_colors(void)
  {
!     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.formwin);
  #endif
  
  #if GTK_CHECK_VERSION(3,22,2)
  	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"
  		"  background-color: #%.2lx%.2lx%.2lx;\n"
  		"}\n",
  		 (gui.back_pixel >> 16) & 0xff,
*** ../vim-8.2.2110/src/version.c	2020-12-08 19:36:17.810905137 +0100
--- src/version.c	2020-12-08 20:31:05.063354100 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2111,
  /**/

-- 
Sometimes I think the surest sign that intelligent life exists elsewhere
in the universe is that none of it has tried to contact us.     (Calvin)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///