patch 8.1.2318: MS-Windows GUI: main background shows in toolbar

Problem:    MS-Windows GUI: main background shows in toolbar.
Solution:   Remove transparency from the toolbar. (Simon Sadler)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 3dbbc5eec0671ec505cf56ef31b94ba8053a468e..cdde3c2bcb2ae1d0a3eeca8bc0c14973a00347a8 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -7859,6 +7859,12 @@ initialise_toolbar(void)
                    TOOLBAR_BUTTON_HEIGHT,
                    sizeof(TBBUTTON)
                    );
+
+    // Remove transparency from the toolbar to prevent the main window
+    // background colour showing through
+    SendMessage(s_toolbarhwnd, TB_SETSTYLE, 0,
+       SendMessage(s_toolbarhwnd, TB_GETSTYLE, 0, 0) & ~TBSTYLE_TRANSPARENT);
+
     s_toolbar_wndproc = SubclassWindow(s_toolbarhwnd, toolbar_wndproc);
 
     gui_mch_show_toolbar(vim_strchr(p_go, GO_TOOLBAR) != NULL);

diff --git a/src/version.c b/src/version.c
index 42100a0a12066bdf4efb4eb4b81566585b5384fc..1adf523b4bc21408fd44733373d973b70e8fab5a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2318,
 /**/
     2317,
 /**/