- fixed minor MIDI keyboard glitches

christophhart · Jul 10, 2024 · 2bcf6f9 · 2bcf6f9
1 parent 5398eec
commit 2bcf6f9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/hi_backend/backend/BackendEditor.cpp b/hi_backend/backend/BackendEditor.cpp
@@ -953,7 +953,8 @@ struct ToolkitPopup : public Component,
         sustainButton.setToggleModeWithColourChange(true);
 
 		keyboard.setUseVectorGraphics(true);
-        keyboard.setRange(24, 127);
+        keyboard.setRange(36, 127);
+		keyboard.setShowOctaveNumber(true);
 
         addAndMakeVisible(clockController);
 
@@ -978,7 +979,7 @@ struct ToolkitPopup : public Component,
             auto l = keyboard.getRangeStart() + delta;
             auto h = jmin(127, keyboard.getRangeEnd() + delta);
 
-            if(l > 0)
+            if(l > 0 && l <= 64)
                 keyboard.setRange(l, h);
         }
 	}

diff --git a/hi_core/hi_components/floating_layout/FloatingTile.cpp b/hi_core/hi_components/floating_layout/FloatingTile.cpp
@@ -1679,6 +1679,40 @@ Component* FloatingTile::wrapInViewport(Component* c, bool shouldBeMaximised)
 	return vp;
 }
 
+void FloatingTile::callToggleCallback()
+{
+	if(auto c = togglePopupCallbackComponent.getComponent())
+	{
+		if(toggleFlag != nullptr)
+		{
+			*toggleFlag = false;
+		}
+
+		c->repaint();
+
+		toggleFlag = nullptr;
+		togglePopupCallbackComponent = {};
+	}
+}
+
+bool FloatingTile::setTogglePopupFlag(Component& c, bool& shouldClose)
+{
+	if(shouldClose)
+	{
+		callToggleCallback();
+		showComponentInRootPopup(nullptr, nullptr, {});
+		return false;
+	}
+	else
+	{
+		callToggleCallback();
+		shouldClose = true;
+		toggleFlag = &shouldClose;
+		togglePopupCallbackComponent = &c;
+		return true;
+	}
+}
+
 FloatingTilePopup* FloatingTile::showComponentInRootPopup(Component* newComponent, Component* attachedComponent, Point<int> localPoint, bool shouldWrapInViewport, bool maximiseViewport)
 {
     if(newComponent != nullptr && shouldWrapInViewport)

diff --git a/hi_core/hi_components/keyboard/CustomKeyboard.cpp b/hi_core/hi_components/keyboard/CustomKeyboard.cpp
@@ -233,6 +233,8 @@ CustomKeyboard::CustomKeyboard(MainController* mc_) :
     narrowKeys(true),
     lowKey(12)
 {
+	setKeyPressBaseOctave(5);
+
 	state->addChangeListener(this);
 
 	setColour(whiteNoteColourId, Colours::black);
@@ -458,10 +460,8 @@ void CustomKeyboard::drawWhiteNote(int midiNoteNumber, Graphics &g, Rectangle<fl
 
 	if (displayOctaveNumber && midiNoteNumber % 12 == 0)
 	{
-		g.setFont(GLOBAL_BOLD_FONT().withHeight((float)w / 3.0f));
-
-        g.setColour(Colours::grey);
-
+		g.setFont(GLOBAL_BOLD_FONT().withHeight((float)w / 1.5f));
+        g.setColour(Colours::darkgrey);
 		g.drawText(MidiMessage::getMidiNoteName(midiNoteNumber, true, true, 3), x, (h*3)/4, w, h / 4, Justification::centred);
 	}