diff --git a/source/panel/curve_panel/background_panel/background_panel.cpp b/source/panel/curve_panel/background_panel/background_panel.cpp index 2f10a9a..3f7ca2e 100644 --- a/source/panel/curve_panel/background_panel/background_panel.cpp +++ b/source/panel/curve_panel/background_panel/background_panel.cpp @@ -15,7 +15,7 @@ namespace zlPanel { zlInterface::UIBase &base) : uiBase(base), gridPanel(base) { - juce::ignoreUnused(parameters); + juce::ignoreUnused(parameters, parametersNA); setInterceptsMouseClicks(false, true); setOpaque(true); addAndMakeVisible(gridPanel); @@ -29,7 +29,6 @@ namespace zlPanel { } void BackgroundPanel::resized() { - auto bound = getLocalBounds().toFloat(); gridPanel.setBounds(getLocalBounds()); } } diff --git a/source/panel/curve_panel/button_panel/button_panel.cpp b/source/panel/curve_panel/button_panel/button_panel.cpp index 892db6a..319e0b7 100644 --- a/source/panel/curve_panel/button_panel/button_panel.cpp +++ b/source/panel/curve_panel/button_panel/button_panel.cpp @@ -203,6 +203,7 @@ namespace zlPanel { } itemsSet.deselectAll(); + previousLassoNum = 0; lassoComponent.setColour(juce::LassoComponent::lassoFillColourId, uiBase.getTextColor().withMultipliedAlpha(.25f)); lassoComponent.setColour(juce::LassoComponent::lassoOutlineColourId, @@ -482,11 +483,12 @@ namespace zlPanel { panels[idx]->repaint(); } } - if (currentSelectedNum == 1 && currentFirstSelectIdx != static_cast(selectBandIdx.load())) { + if (previousLassoNum == 0 && currentSelectedNum > 0 && currentFirstSelectIdx != static_cast(selectBandIdx.load())) { auto *para = parametersNARef.getParameter(zlState::selectedBandIdx::ID); para->beginChangeGesture(); para->setValueNotifyingHost(zlState::selectedBandIdx::convertTo01(currentFirstSelectIdx)); para->endChangeGesture(); + previousLassoNum = currentSelectedNum; } loadPreviousParameters(); } diff --git a/source/panel/curve_panel/button_panel/button_panel.hpp b/source/panel/curve_panel/button_panel/button_panel.hpp index e9c66ea..7966011 100644 --- a/source/panel/curve_panel/button_panel/button_panel.hpp +++ b/source/panel/curve_panel/button_panel/button_panel.hpp @@ -103,6 +103,7 @@ namespace zlPanel { juce::LassoComponent lassoComponent; juce::SelectedItemSet itemsSet; + int previousLassoNum{0}; std::atomic isLeftClick{true}; std::array, zlState::bandNUM> previousFreqs{}, previousGains{}, previousQs{};