Menu
▾
▴
[OMPT-svn-commit] OpenMPT r22452 - trunk/OpenMPT/mptrack
|
From: <sv...@op...> - 2024-12-02 19:12:49
|
Author: sagamusix Date: Mon Dec 2 20:12:42 2024 New Revision: 22452 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22452 Log: [Imp] Disable "always use default highlights" if no highlights are enabled. Small improvements to Display settings UI. Modified: trunk/OpenMPT/mptrack/ColorConfigDlg.cpp trunk/OpenMPT/mptrack/ColorConfigDlg.h trunk/OpenMPT/mptrack/Mptrack.cpp trunk/OpenMPT/mptrack/mptrack.rc Modified: trunk/OpenMPT/mptrack/ColorConfigDlg.cpp ============================================================================== --- trunk/OpenMPT/mptrack/ColorConfigDlg.cpp Mon Dec 2 19:09:28 2024 (r22451) +++ trunk/OpenMPT/mptrack/ColorConfigDlg.cpp Mon Dec 2 20:12:42 2024 (r22452) @@ -88,10 +88,10 @@ ON_COMMAND(IDC_BUTTON11, &COptionsColors::OnClearWindowCache) ON_COMMAND(IDC_LOAD_COLORSCHEME, &COptionsColors::OnLoadColorScheme) ON_COMMAND(IDC_SAVE_COLORSCHEME, &COptionsColors::OnSaveColorScheme) - ON_COMMAND(IDC_CHECK1, &COptionsColors::OnSettingsChanged) + ON_COMMAND(IDC_CHECK1, &COptionsColors::OnHighlightsChanged) ON_COMMAND(IDC_CHECK2, &COptionsColors::OnPreviewChanged) ON_COMMAND(IDC_CHECK3, &COptionsColors::OnSettingsChanged) - ON_COMMAND(IDC_CHECK4, &COptionsColors::OnPreviewChanged) + ON_COMMAND(IDC_CHECK4, &COptionsColors::OnHighlightsChanged) ON_COMMAND(IDC_CHECK5, &COptionsColors::OnSettingsChanged) ON_COMMAND(IDC_RADIO1, &COptionsColors::OnSettingsChanged) ON_COMMAND(IDC_RADIO2, &COptionsColors::OnSettingsChanged) @@ -109,11 +109,16 @@ DDX_Control(pDX, IDC_COMBO2, m_ComboFont); DDX_Control(pDX, IDC_COMBO3, m_ComboPreset); DDX_Control(pDX, IDC_COMBO4, m_ComboDPIAwareness); + DDX_Control(pDX, IDC_BUTTON1, m_BtnColor[0]); + DDX_Control(pDX, IDC_BUTTON2, m_BtnColor[1]); + DDX_Control(pDX, IDC_BUTTON3, m_BtnColor[2]); DDX_Control(pDX, IDC_BUTTON4, m_BtnPreview); DDX_Control(pDX, IDC_TEXT1, m_TxtColor[0]); DDX_Control(pDX, IDC_TEXT2, m_TxtColor[1]); DDX_Control(pDX, IDC_TEXT3, m_TxtColor[2]); DDX_Control(pDX, IDC_SPIN1, m_ColorSpin); + DDX_Control(pDX, IDC_SPIN2, m_spinRowsPerMeasure); + DDX_Control(pDX, IDC_SPIN3, m_spinRowsPerBeat); DDX_Control(pDX, IDC_PRIMARYHILITE, m_rpmEdit); DDX_Control(pDX, IDC_SECONDARYHILITE, m_rpbEdit); //}}AFX_DATA_MAP @@ -173,10 +178,6 @@ m_ComboItem.SetRedraw(TRUE); m_ComboItem.SetCurSel(0); - m_BtnColor[0].SubclassDlgItem(IDC_BUTTON1, this); - m_BtnColor[1].SubclassDlgItem(IDC_BUTTON2, this); - m_BtnColor[2].SubclassDlgItem(IDC_BUTTON3, this); - m_BtnPreview.SetWindowPos(nullptr, 0, 0, HighDPISupport::ScalePixels(PREVIEWBMP_WIDTH * 2, m_hWnd) + 2, HighDPISupport::ScalePixels(PREVIEWBMP_HEIGHT * 2, m_hWnd) + 2, @@ -186,10 +187,14 @@ if (TrackerSettings::Instance().m_dwPatternSetup & PATTERN_2NDHIGHLIGHT) CheckDlgButton(IDC_CHECK4, BST_CHECKED); CheckDlgButton(IDC_CHECK3, TrackerSettings::Instance().patternIgnoreSongTimeSignature ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(IDC_CHECK5, TrackerSettings::Instance().rememberSongWindows ? BST_CHECKED : BST_UNCHECKED); - SetDlgItemInt(IDC_PRIMARYHILITE, TrackerSettings::Instance().m_nRowHighlightMeasures); - SetDlgItemInt(IDC_SECONDARYHILITE, TrackerSettings::Instance().m_nRowHighlightBeats); CheckRadioButton(IDC_RADIO1, IDC_RADIO2, TrackerSettings::Instance().accidentalFlats ? IDC_RADIO2 : IDC_RADIO1); CheckRadioButton(IDC_RADIO3, IDC_RADIO5, IDC_RADIO3 + static_cast<int>(TrackerSettings::Instance().defaultRainbowChannelColors.Get())); + GetDlgItem(IDC_CHECK3)->EnableWindow((IsDlgButtonChecked(IDC_CHECK1) || IsDlgButtonChecked(IDC_CHECK4)) ? TRUE : FALSE); + + SetDlgItemInt(IDC_PRIMARYHILITE, TrackerSettings::Instance().m_nRowHighlightMeasures); + SetDlgItemInt(IDC_SECONDARYHILITE, TrackerSettings::Instance().m_nRowHighlightBeats); + m_spinRowsPerMeasure.SetRange32(0, int32_max); + m_spinRowsPerBeat.SetRange32(0, int32_max); patternFont = TrackerSettings::Instance().patternFont; m_ComboFont.SetRedraw(FALSE); @@ -531,6 +536,14 @@ } } + +void COptionsColors::OnHighlightsChanged() +{ + GetDlgItem(IDC_CHECK3)->EnableWindow((IsDlgButtonChecked(IDC_CHECK1) || IsDlgButtonChecked(IDC_CHECK4)) ? TRUE : FALSE); + OnSettingsChanged(); +} + + void COptionsColors::OnSettingsChanged() { SetModified(TRUE); Modified: trunk/OpenMPT/mptrack/ColorConfigDlg.h ============================================================================== --- trunk/OpenMPT/mptrack/ColorConfigDlg.h Mon Dec 2 19:09:28 2024 (r22451) +++ trunk/OpenMPT/mptrack/ColorConfigDlg.h Mon Dec 2 20:12:42 2024 (r22452) @@ -26,7 +26,7 @@ CComboBox m_ComboDPIAwareness, m_ComboItem, m_ComboFont, m_ComboPreset; ColorPickerButton m_BtnColor[3]; CButton m_BtnPreview; - CSpinButtonCtrl m_ColorSpin; + CSpinButtonCtrl m_ColorSpin, m_spinRowsPerBeat, m_spinRowsPerMeasure; AccessibleEdit m_rpbEdit, m_rpmEdit; CStatic m_TxtColor[3]; MODPLUGDIB *m_pPreviewDib = nullptr; @@ -52,6 +52,7 @@ afx_msg void OnUpdateDialog(); afx_msg void OnDrawItem(int nIdCtl, LPDRAWITEMSTRUCT lpdis); afx_msg void OnColorSelChanged(); + afx_msg void OnHighlightsChanged(); afx_msg void OnSettingsChanged(); afx_msg void OnSelectColor1() { SelectColor(0); } afx_msg void OnSelectColor2() { SelectColor(1); } Modified: trunk/OpenMPT/mptrack/Mptrack.cpp ============================================================================== --- trunk/OpenMPT/mptrack/Mptrack.cpp Mon Dec 2 19:09:28 2024 (r22451) +++ trunk/OpenMPT/mptrack/Mptrack.cpp Mon Dec 2 20:12:42 2024 (r22452) @@ -1310,7 +1310,9 @@ HighDPISupport::SetDPIAwareness(HighDPISupport::Mode::HighDpiPerMonitor); break; default: - MPT_ASSERT_NOTREACHED(); + // Malformed entry in INI file + TrackerSettings::Instance().dpiAwareness = DPIAwarenessMode::PerMonitorDPIAware; + HighDPISupport::SetDPIAwareness(HighDPISupport::Mode::HighDpiPerMonitor); break; } Modified: trunk/OpenMPT/mptrack/mptrack.rc ============================================================================== --- trunk/OpenMPT/mptrack/mptrack.rc Mon Dec 2 19:09:28 2024 (r22451) +++ trunk/OpenMPT/mptrack/mptrack.rc Mon Dec 2 20:12:42 2024 (r22452) @@ -1327,24 +1327,26 @@ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,121,168,10 PUSHBUTTON "Clear Song Cac&he",IDC_BUTTON11,186,119,78,12 CONTROL "&Primary highlight",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,137,84,10 - EDITTEXT IDC_PRIMARYHILITE,102,137,24,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Rows per measure (default)",IDC_STATIC,132,140,144,8 + EDITTEXT IDC_PRIMARYHILITE,102,137,36,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,122,137,10,14 + LTEXT "Rows per measure (default)",IDC_STATIC,144,140,132,8 CONTROL "Secondar&y highlight",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,156,80,10 - EDITTEXT IDC_SECONDARYHILITE,102,156,24,12,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Rows per beat (default)",IDC_STATIC,132,159,144,8 + EDITTEXT IDC_SECONDARYHILITE,102,156,36,12,ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,120,156,11,14 + LTEXT "Rows per beat (default)",IDC_STATIC,144,159,132,8 CONTROL "Always use default highlight &values instead of songs' time signatures",IDC_CHECK3, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,174,258,10 GROUPBOX "Colours",IDC_STATIC,6,204,312,102 LTEXT "Select colo&ur for:",IDC_STATIC,18,218,63,8 - CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,84,216,11,12 COMBOBOX IDC_COMBO1,96,216,156,109,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS | WS_TABSTOP,84,216,11,12 CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,18,234,120,48 - LTEXT "C1",IDC_TEXT1,144,237,108,8 - CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW,258,234,51,12 - LTEXT "C2",IDC_TEXT2,144,254,108,8 - CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW,258,252,51,12 - LTEXT "C3",IDC_TEXT3,144,272,108,8 - CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW,258,270,51,12 + RTEXT "C1",IDC_TEXT1,144,237,108,8 + CONTROL "Change &1",IDC_BUTTON1,"Button",BS_OWNERDRAW | WS_TABSTOP,258,234,51,12 + RTEXT "C2",IDC_TEXT2,144,254,108,8 + CONTROL "Change &2",IDC_BUTTON2,"Button",BS_OWNERDRAW | WS_TABSTOP,258,252,51,12 + RTEXT "C3",IDC_TEXT3,144,272,108,8 + CONTROL "Change &3",IDC_BUTTON3,"Button",BS_OWNERDRAW | WS_TABSTOP,258,270,51,12 LTEXT "Presets:",IDC_STATIC,18,291,36,8 PUSHBUTTON "&Load...",IDC_LOAD_COLORSCHEME,54,288,42,15 PUSHBUTTON "S&ave...",IDC_SAVE_COLORSCHEME,102,288,42,15 |
