dwindows: win/dw.c comparison

comparison win/dw.c @ 2134:9e6e4ebd5e96

Win: Changes to allow drawing in the titlebar so we can add a button there which will be used in place of the non-dark mode menubar. These are experimental changes protected by the DARK_MODE_TITLEBAR_MENU #ifdef.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 07 Jul 2020 23:14:12 +0000
parents	663467f6eee4
children	d9720d48d61e

comparison

equal deleted inserted replaced

-:2090d7f46de5
+:9e6e4ebd5e96
 #ifdef AEROGLASS
 HRESULT (WINAPI *_DwmExtendFrameIntoClientArea)(HWND hWnd, const MARGINS *pMarInset) = 0;
 HRESULT (WINAPI *_DwmIsCompositionEnabled)(BOOL *pfEnabled) = 0;
 HRESULT (WINAPI *_DwmSetWindowAttribute)(HWND, DWORD, LPCVOID, DWORD) = 0;
+BOOL (WINAPI *_DwmDefWindowProc)(HWND, UINT, WPARAM, LPARAM, LRESULT *) = 0;
 HTHEME (WINAPI *_OpenThemeData)(HWND hwnd, LPCWSTR pszClassList) = 0;
 HPAINTBUFFER (WINAPI *_BeginBufferedPaint)(HDC hdcTarget, const RECT *prcTarget, BP_BUFFERFORMAT dwFormat, BP_PAINTPARAMS *pPaintParams, HDC *phdc) = 0;
 HRESULT (WINAPI *_BufferedPaintSetAlpha)(HPAINTBUFFER hBufferedPaint, const RECT *prc, BYTE alpha) = 0;
 HRESULT (WINAPI *_DrawThemeTextEx)(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCWSTR pszText, int iCharCount, DWORD dwFlags, LPRECT pRect, const DTTOPTS *pOptions) = 0;
 HRESULT (WINAPI *_EndBufferedPaint)(HPAINTBUFFER hBufferedPaint, BOOL fUpdateTarget) = 0;
 void _resize_notebook_page(HWND handle, int pageid);
 void _handle_splitbar_resize(HWND hwnd, float percent, int type, int x, int y);
 int _lookup_icon(HWND handle, HICON hicon, int type);
 HFONT _acquire_font(HWND handle, const char *fontname);
 void _click_default(HWND handle);
-void _do_resize(Box *thisbox, int x, int y);
+void _do_resize(Box *thisbox, int x, int y, int xborder, int yborder);
 /* Internal function to queue a window redraw */
 void _dw_redraw(HWND window, int skip)
 {
 static HWND lastwindow = 0;
 }
 /* Our own ShouldAppsUseDarkMode() that handles the forced option */
 BOOL _DW_ShouldAppsUseDarkMode(void)
 {
-if(_DW_DARK_MODE_ALLOWED == 3)
+if(_DW_DARK_MODE_ALLOWED == DW_DARK_MODE_FULL)
 return TRUE;
 return (_ShouldAppsUseDarkMode() && !IsHighContrast());
 }
 void _dw_init_dark_mode(void)
 return FALSE;
 #ifdef TOOLBAR
 else if(_tcsnicmp(tmpbuf, TOOLBARCLASSNAME, _tcslen(TOOLBARCLASSNAME)+1) == 0)
 {
 /* If we aren't in full dark mode */
-if(_DW_DARK_MODE_ALLOWED < 2)
+if(_DW_DARK_MODE_ALLOWED < DW_DARK_MODE_FULL)
 {
 /* Enable or disable visual themes */
 if(_SetWindowTheme)
 _SetWindowTheme(window, (style & TBSTYLE_FLAT) ? L"" : NULL, (style & TBSTYLE_FLAT) ? L"" : NULL);
 }
 {
 if(_DW_DARK_MODE_SUPPORTED)
 {
 if(_CanThemeWindow(window))
 {
-if(_DW_DARK_MODE_ALLOWED > 1)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC)
 {
 if(_DW_DARK_MODE_ENABLED)
 _SetWindowTheme(window, L"DarkMode_Explorer", NULL);
 else
 _SetWindowTheme(window, L"Explorer", NULL);
 {
 HBRUSH retval = GetSysColorBrush(nIndex);
 #ifdef AEROGLASS
 static HBRUSH darkBkColorBrush = 0;
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_ENABLED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 {
 if(!darkBkColorBrush)
 darkBkColorBrush = CreateSolidBrush(0x383838);
 switch(nIndex)
 }
 /* This function calculates how much space the widgets and boxes require
 * and does expansion as necessary.
 */
-static void _resize_box(Box *thisbox, int *depth, int x, int y, int pass)
+static void _resize_box(Box *thisbox, int *depth, int x, int y, int xborder, int yborder, int pass)
 {
 /* Current item position */
 int z, currentx = thisbox->pad, currenty = thisbox->pad;
 /* Used x, y and padding maximum values...
 * These will be used to find the widest or
 if(pass == 1)
 {
 (*depth)++;
 /* Save the newly calculated values on the box */
-_resize_box(tmp, depth, x, y, pass);
+_resize_box(tmp, depth, x, y, 0, 0, pass);
 /* Duplicate the values in the item list for use below */
 thisbox->items[z].width = tmp->minwidth;
 thisbox->items[z].height = tmp->minheight;
 GetClassName(handle, tmpbuf, 99);
 if(_tcsnicmp(tmpbuf, COMBOBOXCLASSNAME, _tcslen(COMBOBOXCLASSNAME)+1)==0)
 {
 /* Handle special case Combobox */
-MoveWindow(handle, currentx + pad, currenty + pad,
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder,
 width, height + 400, FALSE);
 }
 #ifdef TOOLBAR
 /* Bitmap Buttons */
 else if(_tcsnicmp(tmpbuf, TOOLBARCLASSNAME, _tcslen(TOOLBARCLASSNAME)+1) == 0)
 {
 SendMessage(handle, TB_SETBUTTONSIZE, 0, MAKELPARAM(width, height));
-MoveWindow(handle, currentx + pad, currenty + pad, width, height, FALSE);
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder, width, height, FALSE);
 }
 #endif
 else if(_tcsnicmp(tmpbuf, UPDOWN_CLASS, _tcslen(UPDOWN_CLASS)+1)==0)
 {
 /* Handle special case Spinbutton */
 ColorInfo *cinfo = (ColorInfo *)GetWindowLongPtr(handle, GWLP_USERDATA);
-MoveWindow(handle, currentx + pad + (width - 20), currenty + pad,
+MoveWindow(handle, currentx + pad + (width - 20) + xborder, currenty + pad + yborder,
 20, height, FALSE);
 if(cinfo)
 {
-MoveWindow(cinfo->buddy, currentx + pad, currenty + pad,
+MoveWindow(cinfo->buddy, currentx + pad + xborder, currenty + pad + yborder,
 width - 20, height, FALSE);
 }
 }
 else if(_tcsncmp(tmpbuf, ScrollClassName, _tcslen(ScrollClassName)+1)==0)
 {
 /* Save the current scroll positions */
 GetScrollInfo(handle, SB_HORZ, &hsi);
 GetScrollInfo(handle, SB_VERT, &vsi);
 /* Position the scrollbox */
-MoveWindow(handle, currentx + pad, currenty + pad, width, height, FALSE);
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder, width, height, FALSE);
 GetClientRect(handle, &rect);
 cx = rect.right;
 cy = rect.bottom;
 /* Get the required space for the box */
-_resize_box(thisbox, &depth, cx, cy, 1);
+_resize_box(thisbox, &depth, cx, cy, 0, 0, 1);
 if(cx < thisbox->minwidth)
 {
 cx = thisbox->minwidth;
 }
 MoveWindow(cinfo->combo, -hsi.nPos, -vsi.nPos, cx, cy, FALSE);
 SetScrollInfo(handle, SB_HORZ, &hsi, TRUE);
 SetScrollInfo(handle, SB_VERT, &vsi, TRUE);
 /* Layout the content of the scrollbox */
-_do_resize(thisbox, cx, cy);
+_do_resize(thisbox, cx, cy, 0, 0);
 }
 else if(_tcsncmp(tmpbuf, SplitbarClassName, _tcslen(SplitbarClassName)+1)==0)
 {
 /* Then try the bottom or right box */
 float *percent = (float *)dw_window_get_data(handle, "_dw_percent");
 int type = DW_POINTER_TO_INT(dw_window_get_data(handle, "_dw_type"));
-MoveWindow(handle, currentx + pad, currenty + pad,
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder,
 width, height, FALSE);
 if(percent && width > 0 && height > 0)
 _handle_splitbar_resize(handle, *percent, type, width, height);
 }
 /* Figure out how big the text is */
 dw_font_text_extents_get(handle, 0, WideToUTF8(thisbuf), 0, &textheight);
 diff = (total - textheight) / 2;
-MoveWindow(handle, currentx + pad, currenty + pad + diff,
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + diff + yborder,
 width, height - diff, FALSE);
 }
 else
 {
-MoveWindow(handle, currentx + pad, currenty + pad,
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder,
 width, height, FALSE);
 }
 }
 else
 {
 /* Everything else */
 if(*depth)
-MoveWindow(handle, currentx + pad, currenty + pad, width, height, FALSE);
+MoveWindow(handle, currentx + pad + xborder, currenty + pad + yborder, width, height, FALSE);
 else /* FIXME: This is a hack to generate WM_PAINT messages for items on the top-level */
-SetWindowPos(handle, HWND_TOP, currentx + pad, currenty + pad, width, height, 0);
+SetWindowPos(handle, HWND_TOP, currentx + pad + xborder, currenty + pad + yborder, width, height, 0);
 /* After placing a box... place its components */
 if(thisbox->items[z].type == TYPEBOX)
 {
 Box *boxinfo = (Box *)GetWindowLongPtr(handle, GWLP_USERDATA);
 MoveWindow(boxinfo->grouphwnd, 0, 0,
 width, height, FALSE);
 }
 /* Dive into the box */
 (*depth)++;
-_resize_box(boxinfo, depth, width, height, pass);
+_resize_box(boxinfo, depth, width, height, 0, 0, pass);
 (*depth)--;
 }
 }
 }
 }
 }
 }
 }
-void _do_resize(Box *thisbox, int x, int y)
+void _do_resize(Box *thisbox, int x, int y, int xborder, int yborder)
 {
 if(x != 0 && y != 0)
 {
 if(thisbox)
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, x, y, 1);
+_resize_box(thisbox, &depth, x, y, xborder, yborder, 1);
 /* Finally place all the boxes and controls */
-_resize_box(thisbox, &depth, x, y, 2);
+_resize_box(thisbox, &depth, x, y, xborder, yborder, 2);
 }
 }
 }
 int _HandleScroller(HWND handle, int bar, int pos, int which)
 {
 int result = -1, taskbar = FALSE;
 SignalHandler *tmp = Root;
 void (DWSIGNAL *windowfunc)(PVOID);
 ULONG origmsg = msg;
+#ifdef DARK_MODE_TITLEBAR_MENU
+/* Expand the client area into the titlebar so we can draw our alternate dark mode button
+* which when clicked will display the window's menubar menu. Since the menubar cannot be
+* made dark, hide it and add the button to the titlebar instead.
+*/
+if(msg == WM_NCCALCSIZE && mp2 && _DW_DARK_MODE_ENABLED && _DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC)
+{
+MARGINS *margins = dw_window_get_data(hWnd, "_dw_margins");
+RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+if (margins && border_thickness)
+{
+NCCALCSIZE_PARAMS* sz = (NCCALCSIZE_PARAMS*)mp2;
+sz->rgrc[0].left += border_thickness->left;
+sz->rgrc[0].right -= border_thickness->right;
+sz->rgrc[0].bottom -= border_thickness->bottom;
+if (_DwmExtendFrameIntoClientArea)
+_DwmExtendFrameIntoClientArea(hWnd, margins);
+SetWindowPos(hWnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
+return 0;
+}
+}
+else if(msg == WM_NCHITTEST && _DW_DARK_MODE_ENABLED && _DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC)
+{
+/* Handle close/minimize/maximize/help button */
+LRESULT lResult;
+if(_DwmDefWindowProc && _DwmDefWindowProc(hWnd, msg, mp1, mp2, &lResult))
+return lResult;
+/* Do default processing, except change the result for caption area */
+lResult = DefWindowProc(hWnd, msg, mp1, mp2);
+if(lResult == HTCLIENT)
+{
+MARGINS *margins = dw_window_get_data(hWnd, "_dw_margins");
+RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+if (margins && border_thickness)
+{
+POINT pt = { LOWORD(mp2), HIWORD(mp2) };
+ScreenToClient(hWnd, &pt);
+if (pt.y < border_thickness->top) return HTTOP;
+if (pt.y < margins->cyTopHeight)  return HTCAPTION;
+}
+}
+return lResult;
+}
+#endif
 /* Deal with translating some messages */
 if (msg == WM_USER+2)
 {
 taskbar = TRUE;
 _DwmIsCompositionEnabled(&_dw_composition);
 /* If we are no longer compositing... disable layered windows */
 if(!_dw_composition && (styleex & WS_EX_LAYERED))
 {
-MARGINS mar = {0};
+MARGINS *mar = dw_window_get_data(hWnd, "_dw_margins");
 SetWindowLongPtr(hWnd, GWL_EXSTYLE, styleex & ~WS_EX_LAYERED);
-if(_DwmExtendFrameIntoClientArea)
+if(_DwmExtendFrameIntoClientArea && mar)
-_DwmExtendFrameIntoClientArea(hWnd, &mar);
+_DwmExtendFrameIntoClientArea(hWnd, mar);
 }
 }
 break;
 case WM_SETTINGCHANGE:
 {
 break;
 case WM_SIZE:
 {
 static int lastx = -1, lasty = -1;
 static HWND lasthwnd = 0;
+int x = LOWORD(mp2), y = HIWORD(mp2);
-if(lastx != LOWORD(mp2) || lasty != HIWORD(mp2) || lasthwnd != hWnd)
+if(lastx != x || lasty != y || lasthwnd != hWnd)
 {
 Box *mybox = (Box *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 if(mybox && mybox->count)
 {
-lastx = LOWORD(mp2);
+int xborder = 0, yborder = 0;
-lasty = HIWORD(mp2);
+lastx = x;
+lasty = y;
 lasthwnd = hWnd;
+#ifdef DARK_MODE_TITLEBAR_MENU
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
+{
+RECT *border_thickness = dw_window_get_data(hWnd, "_dw_border");
+if(border_thickness)
+{
+dw_debug("Modifying resize from original %d, %d, %d, %d\n", x, y, xborder, yborder);
+x -= (border_thickness->left + border_thickness->right);
+y -= (border_thickness->top + border_thickness->bottom);
+xborder = border_thickness->left;
+yborder = border_thickness->top;
+dw_debug("To resize %d, %d, %d, %d\n", x, y, xborder, yborder);
+}
+}
+#endif
 ShowWindow(mybox->items[0].hwnd, SW_HIDE);
-_do_resize(mybox,LOWORD(mp2),HIWORD(mp2));
+_do_resize(mybox, x, y, xborder, yborder);
 ShowWindow(mybox->items[0].hwnd, SW_SHOW);
 return 0;
 }
 }
 }
 case WM_MOUSEMOVE:
 _wndproc(hWnd, msg, mp1, mp2);
 break;
 #ifdef AEROGLASS
 case WM_THEMECHANGED:
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_SUPPORTED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
 {
 SetClassLongPtr(hWnd, GCLP_HBRBACKGROUND, (LONG_PTR)_DW_GetSysColorBrush(COLOR_3DFACE));
 InvalidateRect(hWnd, NULL, TRUE);
 }
 break;
 SetTextColor((HDC)mp1, RGB(DW_RED_VALUE(fore),
 DW_GREEN_VALUE(fore),
 DW_BLUE_VALUE(fore)));
 }
 #ifdef AEROGLASS
-else if(thiscinfo->fore == DW_CLR_DEFAULT && _DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_ENABLED)
+else if(thiscinfo->fore == DW_CLR_DEFAULT && _DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 SetTextColor((HDC)mp1, _DW_GetSysColor(COLOR_WINDOWTEXT));
 #endif
 /* Handle background */
 if(thiscinfo->back == DW_RGB_TRANSPARENT)
 {
 case WM_CTLCOLOREDIT:
 case WM_CTLCOLORMSGBOX:
 case WM_CTLCOLORSCROLLBAR:
 case WM_CTLCOLORDLG:
 {
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_ENABLED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 {
 ColorInfo *parentcinfo = (ColorInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 int thisback = thiscinfo ? thiscinfo->back : -1;
 if(thisback == DW_RGB_TRANSPARENT && parentcinfo)
 case WM_MOUSEMOVE:
 _wndproc(hWnd, msg, mp1, mp2);
 break;
 #ifdef AEROGLASS
 case WM_THEMECHANGED:
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_SUPPORTED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
 {
 if(!continfo || continfo->cinfo.back == -1 || continfo->cinfo.back == DW_CLR_DEFAULT)
 {
 COLORREF bk = _DW_GetSysColor(COLOR_WINDOW);
 /* Create the colors based on the current theme */
 if(continfo->odd == DW_CLR_DEFAULT)
 {
 #ifdef AEROGLASS
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_ENABLED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
 odd = RGB(100,100,100);
 else
 #endif
 odd = RGB(230, 230, 230);
 }
 LRESULT CALLBACK _treewndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2)
 {
 #ifdef AEROGLASS
 if(msg == WM_THEMECHANGED)
 {
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_SUPPORTED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
 {
 ContainerInfo *continfo = (ContainerInfo *)GetWindowLongPtr(hWnd, GWLP_USERDATA);
 if(!continfo || continfo->cinfo.back == -1 || continfo->cinfo.back == DW_CLR_DEFAULT)
 TreeView_SetBkColor(hWnd, _DW_GetSysColor(COLOR_WINDOW));
 Box *tmp = (Box *)GetWindowLongPtr(handle1, GWLP_USERDATA);
 newx = (int)((float)newx * ratio) - (SPLITBAR_WIDTH/2);
 MoveWindow(handle1, 0, 0, newx, y, FALSE);
-_do_resize(tmp, newx - 1, y - 1);
+_do_resize(tmp, newx - 1, y - 1, 0, 0);
 tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
 newx = x - newx - SPLITBAR_WIDTH;
 MoveWindow(handle2, x - newx, 0, newx, y, FALSE);
-_do_resize(tmp, newx - 1, y - 1);
+_do_resize(tmp, newx - 1, y - 1, 0, 0);
 dw_window_set_data(hwnd, "_dw_start", DW_INT_TO_POINTER(newx));
 }
 else
 {
 Box *tmp = (Box *)GetWindowLongPtr(handle2, GWLP_USERDATA);
 newy = (int)((float)newy * ratio) - (SPLITBAR_WIDTH/2);
 MoveWindow(handle2, 0, y - newy, x, newy, FALSE);
-_do_resize(tmp, x - 1, newy - 1);
+_do_resize(tmp, x - 1, newy - 1, 0, 0);
 tmp = (Box *)GetWindowLongPtr(handle1, GWLP_USERDATA);
 newy = y - newy - SPLITBAR_WIDTH;
 MoveWindow(handle1, 0, 0, x, newy, FALSE);
-_do_resize(tmp, x - 1, newy - 1);
+_do_resize(tmp, x - 1, newy - 1, 0, 0);
 dw_window_set_data(hwnd, "_dw_start", DW_INT_TO_POINTER(newy));
 }
 ShowWindow(handle1, SW_SHOW);
 case WM_ACTIVATE:
 case WM_SETFOCUS:
 return FALSE;
 #ifdef AEROGLASS
 case WM_THEMECHANGED:
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_SUPPORTED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
 InvalidateRect(hwnd, NULL, TRUE);
 break;
 #endif
 case WM_PAINT:
 {
 InvalidateRgn(hwnd, NULL, TRUE);
 return ret;
 }
 #ifdef AEROGLASS
 case WM_THEMECHANGED:
-if(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_SUPPORTED)
+if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_SUPPORTED)
 InvalidateRect(hwnd, NULL, TRUE);
 break;
 #endif
 case WM_PAINT:
 {
 /* If we are in full dark mode, or we have custom colors selected...
 * we will draw the status window ourselves... otherwise DrawStatusText()
 */
 if(
 #ifdef AEROGLASS
-(_DW_DARK_MODE_ALLOWED > 1 && _DW_DARK_MODE_ENABLED) ||
+(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED) ||
 #endif
 (cinfo && cinfo->fore != -1 && cinfo->fore != DW_CLR_DEFAULT &&
 cinfo->back !=- -1 && cinfo->back != DW_CLR_DEFAULT))
 {
 ULONG fore = (cinfo && (cinfo->fore != -1 && cinfo->fore != DW_CLR_DEFAULT)) ? _internal_color(cinfo->fore) : DW_RGB_TRANSPARENT;
 MoveWindow(array[pageid]->hwnd, rect.left, rect.top,
 rect.right - rect.left, rect.bottom-rect.top, TRUE);
 if(box && box->count)
 {
 ShowWindow(box->items[0].hwnd, SW_HIDE);
-_do_resize(box, rect.right - rect.left, rect.bottom - rect.top);
+_do_resize(box, rect.right - rect.left, rect.bottom - rect.top, 0, 0);
 ShowWindow(box->items[0].hwnd, SW_SHOW);
 }
 ShowWindow(array[pageid]->hwnd, SW_SHOWNORMAL);
 }
 /* Attempt to load the Desktop Window Manager and Theme library */
 if(huxtheme && (hdwm = LoadLibrary(TEXT("dwmapi"))))
 {
 _DwmExtendFrameIntoClientArea = (HRESULT (WINAPI *)(HWND, const MARGINS *))GetProcAddress(hdwm, "DwmExtendFrameIntoClientArea");
 _DwmSetWindowAttribute = (HRESULT (WINAPI *)(HWND, DWORD, LPCVOID, DWORD))GetProcAddress(hdwm, "DwmSetWindowAttribute");
+_DwmDefWindowProc = (BOOL (WINAPI *)(HWND, UINT, WPARAM, LPARAM, LRESULT *))GetProcAddress(hdwm, "DwmDefWindowProc");
 if((_DwmIsCompositionEnabled = (HRESULT (WINAPI *)(BOOL *))GetProcAddress(hdwm, "DwmIsCompositionEnabled")))
 _DwmIsCompositionEnabled(&_dw_composition);
 _OpenThemeData = (HTHEME (WINAPI *)(HWND, LPCWSTR))GetProcAddress(huxtheme, "OpenThemeData");
 _BeginBufferedPaint = (HPAINTBUFFER (WINAPI *)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *))GetProcAddress(huxtheme, "BeginBufferedPaint");
 _BufferedPaintSetAlpha = (HRESULT (WINAPI *)(HPAINTBUFFER, const RECT *, BYTE))GetProcAddress(huxtheme, "BufferedPaintSetAlpha");
 int istoplevel = (GetParent(handle) == HWND_DESKTOP);
 GetClientRect(handle, &rect);
 ShowWindow(istoplevel ? mybox->items[0].hwnd : handle, SW_HIDE);
-_do_resize(mybox, rect.right - rect.left, rect.bottom - rect.top);
+_do_resize(mybox, rect.right - rect.left, rect.bottom - rect.top, 0, 0);
 ShowWindow(istoplevel ? mybox->items[0].hwnd : handle, SW_SHOW);
 }
 }
 /*
 {
 HWND hwndframe;
 Box *newbox = calloc(sizeof(Box), 1);
 ULONG flStyleEx = 0;
 #ifdef AEROGLASS
-MARGINS mar = {-1};
+MARGINS *margins = calloc(1, sizeof(MARGINS));
+RECT *border_thickness = calloc(1, sizeof(RECT));
-if(_dw_composition && (flStyle & DW_FCF_COMPOSITED))
+if (_dw_composition && (flStyle & DW_FCF_COMPOSITED))
 flStyleEx = WS_EX_LAYERED;
 #endif
 newbox->type = DW_VERT;
 newbox->vsize = newbox->hsize = SIZEEXPAND;
 flStyleEx |= WS_EX_TOOLWINDOW;
 hwndframe = CreateWindowEx(flStyleEx, ClassName, UTF8toWide(title), (flStyle | WS_CLIPCHILDREN) & 0xffff0000, CW_USEDEFAULT, CW_USEDEFAULT,
 0, 0, hwndOwner, NULL, DWInstance, NULL);
 }
 SetWindowLongPtr(hwndframe, GWLP_USERDATA, (LONG_PTR)newbox);
 if(hwndOwner)
 SetParent(hwndframe, hwndOwner);
 #ifdef AEROGLASS
+/* Determine the borders of the default window frame */
+AdjustWindowRectEx(border_thickness, flStyle, FALSE, 0);
+border_thickness->left *= -1;
+border_thickness->top *= -1;
+/* With the DW_FCF_COMPOSITED flag, expand it to the entire window */
+if (flStyle & DW_FCF_COMPOSITED)
+{
+MARGINS fullmar = { -1 };
+*margins = fullmar;
+}
+else
+{
+/* Otherwise use the calculated border sizes */
+margins->cyTopHeight = border_thickness->top;
+}
+dw_window_set_data(hwndframe, "_dw_margins", margins);
+dw_window_set_data(hwndframe, "_dw_border", border_thickness);
 /* Attempt to enable Aero glass background on the entire window */
-if(_DwmExtendFrameIntoClientArea && _dw_composition && (flStyle & DW_FCF_COMPOSITED))
+if(_DwmExtendFrameIntoClientArea && _dw_composition &&
+((flStyle & DW_FCF_COMPOSITED) || (_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)))
 {
 SetLayeredWindowAttributes(hwndframe, _dw_transparencykey, 0, LWA_COLORKEY);
-_DwmExtendFrameIntoClientArea(hwndframe, &mar);
+_DwmExtendFrameIntoClientArea(hwndframe, margins);
 }
 #endif
 return hwndframe;
 }
 DWORD dwExStyle = GetWindowLong(handle, GWL_EXSTYLE);
 HMENU menu = GetMenu(handle) ;
 RECT rc = { 0 } ;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, *width, *height, 1);
+_resize_box(thisbox, &depth, *width, *height, 0, 0, 1);
 rc.right = thisbox->minwidth;
 rc.bottom = thisbox->minheight;
 /* Take into account the window border and menu here */
 if(thisbox)
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, 0, 0, 1);
+_resize_box(thisbox, &depth, 0, 0, 0, 0, 1);
 /* Return what was requested */
 if(width) *width = thisbox->minwidth;
 if(height) *height = thisbox->minheight;
 }
 #endif
 /* These features are supported and configurable */
 #ifdef AEROGLASS
 case DW_FEATURE_DARK_MODE:
 {
-if(state >= 0 && state <= 3)
+if(state >= DW_DARK_MODE_DISABLED && state <= DW_DARK_MODE_FORCED)
 {
 _DW_DARK_MODE_ALLOWED = state;
 return DW_ERROR_NONE;
 }
 return DW_ERROR_GENERAL;

Mercurial > dwindows

comparison win/dw.c @ 2134:9e6e4ebd5e96