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

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

Author: sagamusix
Date: Fri Nov  8 16:06:32 2024
New Revision: 22113
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22113

Log:
[Fix] Don't invert the new pattern detail icon on dark color schemes.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_pat.cpp
   trunk/OpenMPT/mptrack/ImageLists.h
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Fri Nov  8 14:09:21 2024	(r22112)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Fri Nov  8 16:06:32 2024	(r22113)
@@ -164,7 +164,7 @@
 	m_ToolBar.AddButton(ID_PATTERN_SHRINK, TIMAGE_PATTERN_SHRINK);
 	//	m_ToolBar.AddButton(ID_PATTERN_AMPLIFY, TIMAGE_SAMPLE_AMPLIFY);
 	m_ToolBar.AddButton(ID_SEPARATOR, 0, TBSTYLE_SEP);
-	m_ToolBar.AddButton(ID_PATTERNDETAIL_DROPDOWN, TIMAGE_PATTERN_DETAIL_LO, TBSTYLE_BUTTON | TBSTYLE_DROPDOWN);
+	m_ToolBar.AddButton(ID_PATTERNDETAIL_DROPDOWN, TIMAGE_PATTERN_DETAIL, TBSTYLE_BUTTON | TBSTYLE_DROPDOWN);
 	m_ToolBar.AddButton(ID_SEPARATOR, 0, TBSTYLE_SEP);
 	m_ToolBar.AddButton(ID_OVERFLOWPASTE, TIMAGE_PATTERN_OVERFLOWPASTE, TBSTYLE_CHECK, ((TrackerSettings::Instance().m_dwPatternSetup & PATTERN_OVERFLOWPASTE) ? TBSTATE_CHECKED : 0) | TBSTATE_ENABLED);
 

Modified: trunk/OpenMPT/mptrack/ImageLists.h
==============================================================================
--- trunk/OpenMPT/mptrack/ImageLists.h	Fri Nov  8 14:09:21 2024	(r22112)
+++ trunk/OpenMPT/mptrack/ImageLists.h	Fri Nov  8 16:06:32 2024	(r22113)
@@ -82,9 +82,9 @@
 	TIMAGE_REDO,
 	TIMAGE_PATTERN_PLAYROW,
 	TIMAGE_SAMPLE_DOWNSAMPLE,
-	TIMAGE_PATTERN_DETAIL_LO,
-	TIMAGE_PATTERN_DETAIL_MED,
-	TIMAGE_PATTERN_DETAIL_HI,
+	TIMAGE_PATTERN_DETAIL,
+	TIMAGE_PATTERN_DETAIL_MED,  // unused
+	TIMAGE_PATTERN_DETAIL_HI,  // unused
 	TIMAGE_PATTERN_PLUGINS,
 	TIMAGE_CHANNELMANAGER,
 	TIMAGE_SAMPLE_INVERT,

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Fri Nov  8 14:09:21 2024	(r22112)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Fri Nov  8 16:06:32 2024	(r22113)
@@ -270,7 +270,7 @@
 	CDC *dc = GetDC();
 	const double scaling = Util::GetDPIx(m_hWnd) / 96.0;
 	static constexpr int miscIconsInvert[] = {IMAGE_PATTERNS, IMAGE_OPLINSTRACTIVE, IMAGE_OPLINSTRMUTE};
-	static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_DETAIL_LO, TIMAGE_PATTERN_DETAIL_MED, TIMAGE_PATTERN_DETAIL_HI, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_UNSIGN};
+	static constexpr int patternIconsInvert[] = {TIMAGE_PREVIEW, TIMAGE_MACROEDITOR, TIMAGE_PATTERN_OVERFLOWPASTE, TIMAGE_PATTERN_PLUGINS, TIMAGE_SAMPLE_UNSIGN};
 	static constexpr int envelopeIconsInvert[] = {IIMAGE_CHECKED, IIMAGE_VOLSWITCH, IIMAGE_PANSWITCH, IIMAGE_PITCHSWITCH, IIMAGE_FILTERSWITCH, IIMAGE_NOPITCHSWITCH, IIMAGE_NOFILTERSWITCH};
 	m_MiscIcons.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, false, miscIconsInvert);
 	m_MiscIconsDisabled.Create(IDB_IMAGELIST, 16, 16, IMGLIST_NUMIMAGES, 1, dc, scaling, true, miscIconsInvert);