Mercurial > dwindows

changeset 2139:b1521c8f7861

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: A few minor fixes to that last commit.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 09 Jul 2020 10:16:54 +0000
parents 55263d21b399
children b6e09fb597aa
files win/dw.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/win/dw.c	Thu Jul 09 09:27:05 2020 +0000
+++ b/win/dw.c	Thu Jul 09 10:16:54 2020 +0000
@@ -820,7 +820,7 @@
 MARGINS _dw_rect_to_margins(RECT rect)
 {
    /* Left, Right, Top, Bottom */
-   MARGINS mar = { 1, 1, rect.top, 1 }, none = {0};
+   MARGINS mar = { rect.left, rect.right, rect.top, rect.bottom }, none = {0};
    
    if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC & _DW_DARK_MODE_ENABLED)
       return mar;
@@ -2728,7 +2728,7 @@
          _dw_set_child_window_theme(hWnd, 0);
          EnumChildWindows(hWnd, _dw_set_child_window_theme, 0);
 #ifdef DARK_MODE_TITLEBAR_MENU
-         if(_DW_DARK_MODE_SUPPORTED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
+         if(_DW_DARK_MODE_ALLOWED > DW_DARK_MODE_BASIC && _DW_DARK_MODE_ENABLED)
             SetMenu(hWnd, NULL);
          else
          {
@@ -5822,7 +5822,7 @@
 #ifdef AEROGLASS
    /* Determine the borders of the default window frame */
    AdjustWindowRectEx(&(newbox->cinfo.rect), flStyle, FALSE, 0);
-   newbox->cinfo.rect.left *= -1;
+   newbox->cinfo.rect.right = newbox->cinfo.rect.left = newbox->cinfo.rect.bottom = 1;
    newbox->cinfo.rect.top *= -1;
 
    if(flStyle & DW_FCF_COMPOSITED)