summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-17 22:54:10 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-17 22:54:10 +0100
commit5f763348186007e91932f5134da8dbd0d3bffb11 (patch)
treee583d0c03de437a21881cbb7306e5e3d692f7211
parent37ff4cf87069e54f991d86df9beff19bfdd15875 (diff)
patch 8.1.2318: MS-Windows GUI: main background shows in toolbarv8.1.2318
Problem: MS-Windows GUI: main background shows in toolbar. Solution: Remove transparency from the toolbar. (Simon Sadler)
-rw-r--r--src/gui_w32.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 3dbbc5eec0..cdde3c2bcb 100644
--- 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 42100a0a12..1adf523b4b 100644
--- 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,