quantum/MusicKeyboard
1
0
Fork 0
mirror of https://github.com/quantum5/MusicKeyboard.git synced 2025-04-24 13:11:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up the corner cases.

Browse source
This commit is contained in:
Quantum 2015-01-25 21:17:58 -05:00
parent 936219a3e9
commit 0f297cfae3
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/MainWindow.cpp
View file

@ -233,7 +233,7 @@ LRESULT MainWindow::OnCreate()
SendMessage(m_volumeBar, TBM_SETPOS, FALSE, 0xFFFF); SendMessage(m_volumeBar, TBM_SETPOS, FALSE, 0xFFFF);
SendMessage(m_forceBar, TBM_SETPOS, FALSE, 64); SendMessage(m_forceBar, TBM_SETPOS, FALSE, 64);
SendMessage(m_semitoneUpDown, UDM_SETRANGE32, (WPARAM) -36, 48); SendMessage(m_semitoneUpDown, UDM_SETRANGE32, (WPARAM) -36, 47);
SendMessage(m_semitoneUpDown, UDM_SETPOS32, 0, 0); SendMessage(m_semitoneUpDown, UDM_SETPOS32, 0, 0);
SendMessage(m_octaveUpDown, UDM_SETRANGE32, (WPARAM) -3, 3); SendMessage(m_octaveUpDown, UDM_SETRANGE32, (WPARAM) -3, 3);
SendMessage(m_octaveUpDown, UDM_SETPOS32, 0, 0); SendMessage(m_octaveUpDown, UDM_SETPOS32, 0, 0);
@ -729,10 +729,12 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
switch (LOWORD(wParam)) switch (LOWORD(wParam))
case KEYBOARD_OCTAVE: { case KEYBOARD_OCTAVE: {
if (!adjusting) { if (!adjusting) {
int octave = clamp((int) GetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, NULL, TRUE), -3, 3); int o = GetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, NULL, TRUE);
int octave = clamp(o, -3, 3);
int semitones = octave * 12 + SendMessage(m_keySelect, CB_GETCURSEL, 0, 0); int semitones = octave * 12 + SendMessage(m_keySelect, CB_GETCURSEL, 0, 0);
adjusting = true; adjusting = true;
SetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, octave, TRUE); if (o != octave)
SetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, octave, TRUE);
SetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, semitones, TRUE); SetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, semitones, TRUE);
OnAdjust(); OnAdjust();
adjusting = false; adjusting = false;
@ -740,9 +742,11 @@ LRESULT MainWindow::HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
break; break;
case KEYBOARD_SEMITONE: case KEYBOARD_SEMITONE:
if (!adjusting) { if (!adjusting) {
int semitones = clamp((int) GetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, NULL, TRUE), -36, 48); int s = GetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, NULL, TRUE);
int semitones = clamp(s, -36, 47);
adjusting = true; adjusting = true;
SetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, semitones, TRUE); if (s != semitones)
SetDlgItemInt(m_hwnd, KEYBOARD_SEMITONE, semitones, TRUE);
SetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, (WPARAM) floor(semitones / 12.0), TRUE); SetDlgItemInt(m_hwnd, KEYBOARD_OCTAVE, (WPARAM) floor(semitones / 12.0), TRUE);
SendMessage(m_keySelect, CB_SETCURSEL, (semitones % 12 + 12) % 12, 0); SendMessage(m_keySelect, CB_SETCURSEL, (semitones % 12 + 12) % 12, 0);
OnAdjust(); OnAdjust();