Mercurial > dwindows

changeset 1980:38a455d2096c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: Disable window styles for checkboxes, radio buttons and groupboxes. With themes not disabled, they cannot change text color.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 13 Aug 2019 06:35:13 +0000
parents 290e661abb63
children ccd34ec31971
files win/dw.c
diffstat 1 files changed, 34 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/win/dw.c	Tue Aug 13 00:20:52 2019 +0000
+++ b/win/dw.c	Tue Aug 13 06:35:13 2019 +0000
@@ -749,20 +749,31 @@
    }
 }
 
+BOOL _CanThemeWindow(HWND window)
+{
+   TCHAR tmpbuf[100] = {0};
+   LONG_PTR style = GetWindowLongPtr(window, GWL_STYLE);
+   
+   GetClassName(window, tmpbuf, 99);
+
+   /* Some controls don't display properly with visual styles enabled */
+   if(_tcsnicmp(tmpbuf, BUTTONCLASSNAME, _tcslen(BUTTONCLASSNAME)+1) == 0 && 
+      (style & (BS_AUTOCHECKBOX | BS_CHECKBOX | BS_RADIOBUTTON)))
+      return FALSE;
+#ifdef TOOLBAR
+   else if(_tcsnicmp(tmpbuf, TOOLBARCLASSNAME, _tcslen(TOOLBARCLASSNAME)+1) == 0)
+      return FALSE;
+#endif
+   return TRUE;
+}
+
 BOOL AllowDarkModeForWindow(HWND window, BOOL allow)
 {
    if(_DW_DARK_MODE_SUPPORTED)
    {
       if(_DW_DARK_MODE_ALLOWED == 2)
       {
-#ifdef TOOLBAR
-         TCHAR tmpbuf[100] = {0};
-         
-         GetClassName(window, tmpbuf, 99);
-
-         /* Toolbar controls don't display properly with visual styles enabled */
-         if(_tcsnicmp(tmpbuf, TOOLBARCLASSNAME, _tcslen(TOOLBARCLASSNAME)+1) != 0)
-#endif
+         if(_CanThemeWindow(window))
          {
             if(_DW_DARK_MODE_ENABLED)
                _SetWindowTheme(window, L"DarkMode_Explorer", NULL);
@@ -5622,6 +5633,10 @@
                             DWInstance,
                             NULL);
 
+   /* Disable visual styles by default */
+   if(_SetWindowTheme)
+      _SetWindowTheme(newbox->grouphwnd, L"", L"");
+
    SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
    newbox->cinfo.pOldProc = SubclassWindow(hwndframe, _colorwndproc);
    dw_window_set_font(hwndframe, DefaultFont);
@@ -6560,7 +6575,7 @@
    /* Create the toolbar */
    tmp = CreateWindowEx(0L, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_AUTOSIZE | CCS_NORESIZE | 
                         CCS_NOPARENTALIGN | CCS_NODIVIDER, 0, 0, 100, 30, DW_HWND_OBJECT, (HMENU)(uintptr_t)id, DWInstance, NULL);
-                         
+
    /* Disable visual styles by default */
    if(_SetWindowTheme)
       _SetWindowTheme(tmp, L"", L"");
@@ -6862,6 +6877,11 @@
                      (HMENU)(uintptr_t)id,
                      DWInstance,
                      NULL);
+
+   /* Disable visual styles by default */
+   if(_SetWindowTheme)
+      _SetWindowTheme(tmp, L"", L"");
+
    ColorInfo *cinfo = calloc(1, sizeof(ColorInfo));
    cinfo->fore = cinfo->back = -1;
    cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
@@ -6963,6 +6983,11 @@
                      (HMENU)(uintptr_t)id,
                      DWInstance,
                      NULL);
+
+   /* Disable visual styles by default */
+   if(_SetWindowTheme)
+      _SetWindowTheme(tmp, L"", L"");
+
    cinfo->pOldProc = SubclassWindow(tmp, _BtProc);
    SetWindowLongPtr(tmp, GWLP_USERDATA, (LONG_PTR)cinfo);
    dw_window_set_data(tmp, "_dw_checkbox", DW_INT_TO_POINTER(1));