Author: sagamusix
Date: Sat Jun 15 14:48:16 2024
New Revision: 21031
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21031
Log:
[Fix] General tab: Enabling composited window mode breaks UI updates when using UI scaling in Windows (which might also explain why some plugin GUIs have the same issue in OpenMPT). A better workaround for the issue with garbage background on the group boxes is to set their background mode to transparent (https://bugs.openmpt.org/view.php?id=1789).
Modified:
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/mptrack.rc
==============================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc Sat Jun 15 00:03:43 2024 (r21030)
+++ trunk/OpenMPT/mptrack/mptrack.rc Sat Jun 15 14:48:16 2024 (r21031)
@@ -19,10 +19,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
#pragma code_page(1252)
-#if !defined(WS_EX_COMPOSITED)
-#define WS_EX_COMPOSITED 0x02000000L
-#endif
-
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
@@ -1703,22 +1699,21 @@
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
+ CONTROL "",IDC_TABCTRL1,"SysTabControl32",WS_TABSTOP,0,0,412,14
+ GROUPBOX "Channel 1",IDC_TEXT1,5,18,99,157,0,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT9,10,30,89,12,ES_AUTOHSCROLL
- GROUPBOX "Channel 2",IDC_TEXT2,108,18,99,157
+ GROUPBOX "Channel 2",IDC_TEXT2,108,18,99,157,0,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT10,113,30,89,12,ES_AUTOHSCROLL
- GROUPBOX "Channel 3",IDC_TEXT3,211,18,99,157
+ GROUPBOX "Channel 3",IDC_TEXT3,211,18,99,157,0,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT11,216,30,89,12,ES_AUTOHSCROLL
- GROUPBOX "Channel 4",IDC_TEXT4,314,18,99,157
+ GROUPBOX "Channel 4",IDC_TEXT4,314,18,99,157,0,WS_EX_TRANSPARENT
EDITTEXT IDC_EDIT12,319,30,89,12,ES_AUTOHSCROLL
+ CONTROL "",IDC_BUTTON9,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,66,16,33,11,WS_EX_TRANSPARENT
+ CONTROL "",IDC_BUTTON10,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,169,16,33,11,WS_EX_TRANSPARENT
+ CONTROL "",IDC_BUTTON11,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,272,16,33,11,WS_EX_TRANSPARENT
+ CONTROL "",IDC_BUTTON12,"Button",BS_OWNERDRAW | BS_FLAT | WS_TABSTOP,375,16,33,11,WS_EX_TRANSPARENT
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
@@ -1767,7 +1762,7 @@
COMBOBOX IDC_COMBO3,216,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Effect:",IDC_STATIC,319,146,29,8
COMBOBOX IDC_COMBO4,319,155,89,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Plugins",IDC_STATIC,5,177,408,141
+ GROUPBOX "Plugins",IDC_STATIC,5,177,408,141,0,WS_EX_TRANSPARENT
PUSHBUTTON "<<",IDC_BUTTON5,11,191,18,13
PUSHBUTTON ">>",IDC_BUTTON4,32,191,18,13
COMBOBOX IDC_COMBO5,53,191,135,148,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -1781,16 +1776,16 @@
EDITTEXT IDC_EDIT13,312,191,94,13,ES_CENTER | ES_AUTOHSCROLL
CTEXT "I/O Type:",IDC_STATIC,263,208,47,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
CONTROL "",IDC_TEXT6,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,312,208,95,13,WS_EX_STATICEDGE
- GROUPBOX "Factory Preset",IDC_STATIC,11,226,177,34
+ GROUPBOX "Factory Preset",IDC_STATIC,11,226,177,34,0,WS_EX_TRANSPARENT
COMBOBOX IDC_COMBO8,16,239,102,68,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Load",IDC_BUTTON6,122,239,27,13
PUSHBUTTON "Save",IDC_BUTTON8,154,239,27,13
- GROUPBOX "",IDC_STATIC,11,255,177,57
+ GROUPBOX "",IDC_STATIC,11,255,177,57,0,WS_EX_TRANSPARENT
CTEXT "Parameter",IDC_STATIC,16,266,43,13,SS_CENTERIMAGE
COMBOBOX IDC_COMBO6,61,266,122,162,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "ValSld",IDC_SLIDER9,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,16,286,102,14
EDITTEXT IDC_EDIT14,121,286,62,14,ES_AUTOHSCROLL
- GROUPBOX "Mix Settings",IDC_STATIC,193,226,214,86
+ GROUPBOX "Mix Settings",IDC_STATIC,193,226,214,86,0,WS_EX_TRANSPARENT
CONTROL "&Master",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,199,242,46,10
CTEXT "Mix Mode",IDC_STATIC,245,241,37,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO9,285,241,62,99,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
