From f0f7aaa7683085a4c29453c842131f79647d3912 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Wed, 21 Dec 2011 13:48:31 -0800 Subject: [PATCH] Don't allow the user to add speed timings while selecting until fully supported. --- src/ScreenEdit.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 102d0198d0..0f91a1feba 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -3645,6 +3645,8 @@ void ScreenEdit::DisplayTimingMenu() float fBeat = GetBeat(); TimingData &pTime = GetAppropriateTiming(); bool bHasSpeedOnThisRow = pTime.GetSpeedSegmentAtBeat( fBeat )->GetBeat() == fBeat; + bool bIsSelecting = ( (m_NoteFieldEdit.m_iEndMarker != -1) && (m_NoteFieldEdit.m_iBeginMarker != -1) ); + g_TimingDataInformation.rows[beat_0_offset].SetOneUnthemedChoice( ssprintf("%.6f", pTime.m_fBeat0OffsetInSeconds) ); g_TimingDataInformation.rows[bpm].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetBPMAtBeat( fBeat ) ) ); @@ -3673,6 +3675,7 @@ void ScreenEdit::DisplayTimingMenu() g_TimingDataInformation.rows[scroll].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetScrollAtBeat( fBeat ) ) ); g_TimingDataInformation.rows[fake].SetOneUnthemedChoice( ssprintf("%.6f", pTime.GetFakeAtBeat( fBeat ) ) ); + g_TimingDataInformation.rows[speed_percent].bEnabled = !bIsSelecting; g_TimingDataInformation.rows[speed_wait].bEnabled = bHasSpeedOnThisRow; g_TimingDataInformation.rows[speed_mode].bEnabled = bHasSpeedOnThisRow;