# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1574028003 -3600
# Node ID 94b88fa5825d32c750d85e5b4474087b4cceb8da
# Parent  5564052378b99e614ca15e1a4372d3caea9fbd7f
patch 8.1.2318: MS-Windows GUI: main background shows in toolbar

Commit: https://github.com/vim/vim/commit/5f763348186007e91932f5134da8dbd0d3bffb11
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Nov 17 22:54:10 2019 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2318,
+/**/
     2317,
 /**/
     2316,