[OMPT-svn-commit] OpenMPT r20884 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Fri May 31 19:26:15 2024
New Revision: 20884
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20884

Log:
[Fix] General tab: In r14537, drawing of the background of some regions in the lower half of the general tab under some circumstances (strangely, it appears to depend on whether position of the currently selected tab is right of the rightmost pixel of the dialog resource). This happens because the Z-order of the tab control was changed in that commit. However, putting the tab control bottom-most is required for tooltips to work. Setting the dialog style to WS_EX_COMPOSITED fixes the problem for some reason while keeping tooltips working.

Modified:
   trunk/OpenMPT/mptrack/mptrack.rc

Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 16:13:28 2024	(r20883)
+++ trunk/OpenMPT/mptrack/mptrack.rc	Fri May 31 19:26:15 2024	(r20884)
@@ -1699,9 +1699,14 @@
 
 IDD_VIEW_GLOBALS DIALOGEX 0, 0, 422, 326
 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_COMPOSITED
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "",IDC_TABCTRL1,"SysTabControl32",0x0,0,0,412,14
+    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11
+    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11
+    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11
+    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11
     GROUPBOX        "Channel 1",IDC_TEXT1,5,18,99,157
     EDITTEXT        IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 2",IDC_TEXT2,108,18,99,157
@@ -1710,10 +1715,6 @@
     EDITTEXT        IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
     GROUPBOX        "Channel 4",IDC_TEXT4,314,18,99,157
     EDITTEXT        IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
-    CONTROL         "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11
-    CONTROL         "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11
-    CONTROL         "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11
-    CONTROL         "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11
     LTEXT           "Initial Volume:",IDC_STATIC,10,48,45,8
     EDITTEXT        IDC_EDIT1,63,46,36,12,ES_NUMBER
     CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,95,45,11,14