aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-20 08:14:18 -04:00
Code Activity

patch 9.1.1830: MS-Windows: Dark mode titlebar is not configurable

Browse Source 
Problem:  MS-Windows: Dark mode titlebar is not configurable
          (after v9.1.1813)
Solution: Revert patch v9.1.1813

Revert "patch 9.1.1813: MS-Windows: title bar is always white"
This reverts commit dddde9ce12.

related: #18282

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2025-10-05 16:51:27 +00:00
parent b73ccf7ff0
commit 3b3cb04fa3
6 changed files with 5 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/gui_w32.c
View File

@@ -318,14 +318,6 @@ gui_mch_set_rendering_options(char_u *s)
# define SPI_SETWHEELSCROLLCHARS 0x006D
#endif
#ifndef DWMWA_CAPTION_COLOR
# define DWMWA_CAPTION_COLOR 35
#endif
#ifndef DWMWA_TEXT_COLOR
# define DWMWA_TEXT_COLOR 36
#endif
#ifdef PROTO
/*
* Define a few things for generating prototypes. This is just to avoid
@@ -476,9 +468,6 @@ static int (WINAPI *pGetSystemMetricsForDpi)(int, UINT) = NULL;
static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT dpiContext) = NULL;
static DPI_AWARENESS (WINAPI *pGetAwarenessFromDpiAwarenessContext)(DPI_AWARENESS_CONTEXT) = NULL;
// Sets the value of Desktop Window Manager (DWM) non-client rendering attributes for a window.
static HRESULT (WINAPI *pDwmSetWindowAttribute)(HWND, DWORD, LPCVOID, DWORD) = NULL;
static int WINAPI
stubGetSystemMetricsForDpi(int nIndex, UINT dpi UNUSED)
{
@@ -1602,20 +1591,6 @@ _TextAreaWndProc(
}
}
static void
load_dwm_func(void)
{
static HMODULE hLibDwm = NULL;
hLibDwm = vimLoadLib("dwmapi.dll");
if (hLibDwm == NULL)
return;
pDwmSetWindowAttribute = (HRESULT (WINAPI *)(HWND, DWORD, LPCVOID, DWORD))
GetProcAddress(hLibDwm, "DwmSetWindowAttribute");
}
extern BOOL win11_or_later; // this is in os_win32.c
/*
* Called when the foreground or background color has been changed.
*/
@@ -1629,21 +1604,6 @@ gui_mch_new_colors(void)
s_hwnd, GCLP_HBRBACKGROUND, (LONG_PTR)s_brush);
InvalidateRect(s_hwnd, NULL, TRUE);
DeleteObject(prevBrush);
// Set The Caption Bar
if (pDwmSetWindowAttribute == NULL)
return;
if (win11_or_later)
{
const COLORREF captionColor = gui.back_pixel;
pDwmSetWindowAttribute(s_hwnd, DWMWA_CAPTION_COLOR,
&captionColor, sizeof(captionColor));
const COLORREF textColor = gui.norm_pixel;
pDwmSetWindowAttribute(s_hwnd, DWMWA_TEXT_COLOR,
&textColor, sizeof(textColor));
}
}
/*
@@ -5676,8 +5636,6 @@ gui_mch_init(void)
load_dpi_func();
load_dwm_func();
s_dpi = pGetDpiForSystem();
update_scrollbar_size();

10
src/os_win32.c
View File

@@ -222,10 +222,8 @@ static int suppress_winsize = 1; // don't fiddle with console
static WCHAR *exe_pathw = NULL;
BOOL win8_or_later = FALSE;
BOOL win10_22H2_or_later = FALSE;
BOOL win11_or_later = FALSE;
static BOOL win8_or_later = FALSE;
static BOOL win10_22H2_or_later = FALSE;
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
static BOOL use_alternate_screen_buffer = FALSE;
#endif
@@ -1012,10 +1010,6 @@ PlatformId(void)
|| ovi.dwMajorVersion > 10)
win10_22H2_or_later = TRUE;
if ((ovi.dwMajorVersion == 10 && ovi.dwBuildNumber >= 22000)
|| ovi.dwMajorVersion > 10)
win11_or_later = TRUE;
#ifdef HAVE_ACL
// Enable privilege for getting or setting SACLs.
if (!win32_enable_privilege(SE_SECURITY_NAME))

2
src/version.c
View File

@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1830,
/**/
1829,
/**/