brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add squeeze modules parameter, adjust view menu alike Rack

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-07-08 12:45:19 +01:00
parent 5e93775d26
commit a0a5fa134a
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
7 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/override/MenuBar.cpp
View file

@ -489,6 +489,8 @@ struct ViewButton : MenuButton {
menu->cornerFlags = BND_CORNER_TOP;
menu->box.pos = getAbsoluteOffset(math::Vec(0, box.size.y));
menu->addChild(createMenuLabel("Appearance"));
menu->addChild(createBoolPtrMenuItem("Show tooltips", "", &settings::tooltips));
ZoomSlider* zoomSlider = new ZoomSlider;
@ -512,8 +514,16 @@ struct ViewButton : MenuButton {
menu->addChild(haloBrightnessSlider);
menu->addChild(new ui::MenuSeparator);
menu->addChild(createMenuLabel("Module dragging"));
// menu->addChild(createBoolPtrMenuItem("Hide cursor while dragging", "", &settings::allowCursorLock));
menu->addChild(createBoolPtrMenuItem("Lock module positions", "", &settings::lockModules));
menu->addChild(createBoolPtrMenuItem("Auto-squeeze modules when dragging", "", &settings::squeezeModules));
menu->addChild(new ui::MenuSeparator);
menu->addChild(createMenuLabel("Parameters"));
// menu->addChild(createBoolPtrMenuItem("Lock cursor while dragging", "", &settings::allowCursorLock));
static const std::vector<std::string> knobModeLabels = {
"Linear",
@ -537,12 +547,11 @@ struct ViewButton : MenuButton {
knobScrollSensitivitySlider->box.size.x = 250.0;
menu->addChild(knobScrollSensitivitySlider);
menu->addChild(createBoolPtrMenuItem("Lock module positions", "", &settings::lockModules));
menu->addChild(new ui::MenuSeparator);
menu->addChild(createMenuLabel("Window"));
menu->addChild(createBoolPtrMenuItem("Invert zoom", "", &settings::invertZoom));
menu->addChild(new ui::MenuSeparator);
static const std::vector<std::string> rateLimitLabels = {
"None",
"2x",

8
src/override/Window.cpp
View file

@ -775,6 +775,13 @@ void WindowParametersSave(rack::window::Window* const window)
window->internal->callback->WindowParametersChanged(kWindowParameterLockModulePositions,
rack::settings::lockModules);
}
if (window->internal->params.squeezeModules != rack::settings::squeezeModules)
{
window->internal->params.squeezeModules = rack::settings::squeezeModules;
if (window->internal->callback != nullptr)
window->internal->callback->WindowParametersChanged(kWindowParameterSqueezeModulePositions,
rack::settings::squeezeModules);
}
if (window->internal->params.invertZoom != rack::settings::invertZoom)
{
window->internal->params.invertZoom = rack::settings::invertZoom;
@ -804,6 +811,7 @@ void WindowParametersRestore(rack::window::Window* const window)
rack::settings::tooltips = window->internal->params.tooltips;
rack::settings::knobScroll = window->internal->params.knobScroll;
rack::settings::lockModules = window->internal->params.lockModules;
rack::settings::squeezeModules = window->internal->params.squeezeModules;
rack::settings::invertZoom = window->internal->params.invertZoom;
rack::settings::rateLimit = window->internal->params.rateLimit;
}