Skip to content

Commit f09a8e8

Browse files
committed
Fix #100 and bug where 3rd snaps were not saved to the simfile.
1 parent 305ef53 commit f09a8e8

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

src/Dialogs/AdjustSync.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ WgSpinner* DialogAdjustSync::myCreateWidgetRow(StringRef label, double& val, int
5050
{
5151
WgSpinner* spinner = myLayout.add<WgSpinner>(label);
5252
spinner->value.bind(&val);
53-
spinner->setPrecision(3, 3);
53+
spinner->setPrecision(3, 6);
5454
spinner->onChange.bind(this, &DialogAdjustSync::onAction, setAction);
5555
spinner->setTooltip(tooltip1);
5656

src/Dialogs/AdjustTempoSM5.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void DialogAdjustTempoSM5::myCreateWidgets()
6161

6262
WgSpinner* spinner = myLayout.add<WgSpinner>("Delay");
6363
spinner->value.bind(&myDelay);
64-
spinner->setPrecision(3, 3);
64+
spinner->setPrecision(3, 6);
6565
spinner->setStep(0.001);
6666
spinner->setRange(0, 1000);
6767
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_DELAY_SET);
@@ -70,7 +70,7 @@ void DialogAdjustTempoSM5::myCreateWidgets()
7070
myLayout.row().col(84).col(154);
7171
spinner = myLayout.add<WgSpinner>("Warp");
7272
spinner->value.bind(&myWarp);
73-
spinner->setPrecision(3, 3);
73+
spinner->setPrecision(3, 6);
7474
spinner->setRange(0, 1000);
7575
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_WARP_SET);
7676
spinner->setTooltip("Warp length at the current beat, in beats");
@@ -120,15 +120,15 @@ void DialogAdjustTempoSM5::myCreateWidgets()
120120

121121
spinner = myLayout.add<WgSpinner>("Speed");
122122
spinner->value.bind(&mySpeedRatio);
123-
spinner->setPrecision(2, 2);
123+
spinner->setPrecision(2, 6);
124124
spinner->setStep(0.1);
125125
spinner->setRange(0, 1000);
126126
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_SPEED_SET);
127127
spinner->setTooltip("Stretch ratio");
128128

129129
spinner = myLayout.add<WgSpinner>();
130130
spinner->value.bind(&mySpeedDelay);
131-
spinner->setPrecision(2, 2);
131+
spinner->setPrecision(2, 6);
132132
spinner->setStep(0.1);
133133
spinner->setRange(0, 1000);
134134
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_SPEED_SET);
@@ -145,15 +145,15 @@ void DialogAdjustTempoSM5::myCreateWidgets()
145145

146146
spinner = myLayout.add<WgSpinner>("Scroll");
147147
spinner->value.bind(&myScrollRatio);
148-
spinner->setPrecision(2, 2);
148+
spinner->setPrecision(2, 6);
149149
spinner->setStep(0.1);
150150
spinner->setRange(0, 1000);
151151
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_SCROLL_SET);
152152
spinner->setTooltip("Scroll ratio");
153153

154154
spinner = myLayout.add<WgSpinner>("Fakes");
155155
spinner->value.bind(&myFakeBeats);
156-
spinner->setPrecision(3, 3);
156+
spinner->setPrecision(3, 6);
157157
spinner->setRange(0, 1000);
158158
spinner->onChange.bind(this, &DialogAdjustTempoSM5::onAction, (int)ACT_FAKE_SET);
159159
spinner->setTooltip("Fake region, in beats");

src/Dialogs/CustomSnap.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@ namespace Vortex {
2626
WgSpinner* scol = myLayout.add<WgSpinner>("Snapping");
2727
scol->value.bind(&myCustomSnap);
2828
scol->onChange.bind(this, &DialogCustomSnap::onChange);
29-
scol->setRange(1.0, 192.0);
29+
scol->setRange(4.0, 192.0);
3030
scol->setPrecision(0, 0);
3131
scol->startCapturingText();
3232
}
3333

3434
void DialogCustomSnap::onChange()
3535
{
36-
if (myCustomSnap > 0 && myCustomSnap <= 192)
36+
if (myCustomSnap >= 4 && myCustomSnap <= 192)
3737
{
3838
gView->setCustomSnap(myCustomSnap);
39-
//requestClose();
4039
}
4140
}
4241
}; // namespace Vortex

src/Editor/View.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ViewImpl()
7171
, myZoomLevel(8)
7272
, myScaleLevel(4)
7373
, mySnapType(ST_NONE)
74-
, myCustomSnap(1)
74+
, myCustomSnap(20)
7575
, myUseTimeBasedView(true)
7676
, myUseReverseScroll(false)
7777
, myUseChartPreview(false)
@@ -100,7 +100,7 @@ void loadSettings(XmrNode& settings)
100100
view->get("receptorX", &myReceptorX);
101101
view->get("receptorY", &myReceptorY);
102102

103-
myCustomSnap = min(max(myCustomSnap, 1), 192);
103+
myCustomSnap = min(max(myCustomSnap, 5), 191);
104104
myZoomLevel = min(max(myZoomLevel, -2.0), 16.0);
105105
myScaleLevel = min(max(myScaleLevel, 1.0), 10.0);
106106
}
@@ -441,7 +441,7 @@ void setSnapType(int type)
441441

442442
void setCustomSnap(int size)
443443
{
444-
if (size < 1) size = 1;
444+
if (size < 4) size = 4;
445445
if (size > 192) size = 192;
446446
// If the custom snap is a non-custom value, set the snap to that value instead
447447
for (int i = 0; i < ST_CUSTOM; i++)

0 commit comments

Comments
 (0)