More small layout fixes

Author: timothyschoen

Source/PluginEditor.cpp

@@ -503,8 +503,9 @@ void PluginEditor::showWelcomePanel(bool const shouldShow)
     undoButton.setVisible(!shouldShow);
     redoButton.setVisible(!shouldShow);
     sidebar->setVisible(!shouldShow);
+    audioToolbar->setVisible(!shouldShow);
 
-    welcomePanelSearchButton.setVisible(false); // TODO: fix this!
+    welcomePanelSearchButton.setVisible(shouldShow);
     recentlyOpenedPanelSelector.setVisible(shouldShow);
     libraryPanelSelector.setVisible(shouldShow);
 
@@ -621,7 +622,7 @@ void PluginEditor::resized()
             resizerSize, resizerSize);
     }
 
-    welcomePanelSearchButton.setBounds(getWidth() - windowControlsOffset, 0, buttonSize, buttonSize);
+    welcomePanelSearchButton.setBounds(getWidth() - (windowControlsOffset + 40.f), 0, buttonSize, buttonSize);
 
     welcomePanelSearchInput.setBounds(libraryPanelSelector.getRight() + 10, 4, welcomePanelSearchButton.getX() - libraryPanelSelector.getRight() - 20, toolbarHeight - 4);
 

Source/Sidebar/CommandInput.h

@@ -248,7 +248,7 @@ class CommandInput final
             updateSize();
         };
 
-        commandInput.setBorder({ 3, 3, 0, 0 });
+        commandInput.setBorder({ 4, 3, 0, 0 });
         commandInput.addKeyListener(this);
         commandInput.addMouseListener(this, false);
         commandInput.setFont(Fonts::getDefaultFont().withHeight(15));
@@ -709,31 +709,20 @@ class CommandInput final
         auto bounds = getLocalBounds();
         g.setColour(PlugDataColours::dataColour);
         g.setFont(Fonts::getSemiBoldFont().withHeight(15));
-        g.drawText(consoleTargetName, bounds.getX() + 7, bounds.getY(), consoleTargetLength, bounds.getHeight() - 3, Justification::centredLeft);
+        g.drawText(consoleTargetName, bounds.getX() + 9, bounds.getY(), consoleTargetLength, bounds.getHeight() - 1, Justification::centredLeft);
     }
 
     void paint(Graphics& g) override
     {
         auto bounds = getLocalBounds();
-        /*
-        g.setFont(Fonts::getSemiBoldFont().withHeight(15));
-        g.setColour(PlugDataColours::panelTextColour);
-        g.drawText("Command input", bounds.removeFromTop(22), Justification::centred);
-
-        bounds.removeFromTop(4);
-
-        if (helpButton.getToggleState()) {
-            bounds.removeFromTop(200);
-        } */
-
         g.setColour(PlugDataColours::levelMeterBackgroundColour);
-        g.fillRoundedRectangle(bounds.reduced(2, 2).toFloat(), Corners::defaultCornerRadius);
+        g.fillRoundedRectangle(bounds.reduced(2, 1).toFloat(), Corners::defaultCornerRadius);
     }
 
     void resized() override
     {
         auto inputBounds = getLocalBounds();
-        commandInput.setBounds(inputBounds.withTrimmedLeft(consoleTargetLength).withTrimmedRight(30));
+        commandInput.setBounds(inputBounds.withTrimmedLeft(consoleTargetLength + 4).withTrimmedRight(30));
         auto const buttonBounds = inputBounds.removeFromRight(30);
         clearButton.setBounds(buttonBounds);
     }
@@ -744,7 +733,7 @@ class CommandInput final
         if (target == "empty")
             consoleTargetName = ">";
         consoleTargetLength = CachedStringWidth<15>::calculateStringWidth(consoleTargetName) + 4;
-        commandInput.setBounds(commandInput.getBounds().withLeft(consoleTargetLength));
+        commandInput.setBounds(commandInput.getBounds().withLeft(consoleTargetLength + 4));
         repaint();
     }
 

Source/Sidebar/Sidebar.cpp

@@ -133,9 +133,9 @@ void Sidebar::paint(Graphics& g)
         Fonts::drawStyledText(g, panelName, Rectangle<int>(0, 0, getWidth() - 30, 30), PlugDataColours::toolbarTextColour, Bold, 15, Justification::centred);
 
         if (inspectorButton.isInspectorPinned()) {
-            auto inpectorPos = Point<int>(0, dividerFactor * getHeight());
+            auto inpectorPos = Point<int>(0, dividerFactor * (getHeight() - getCommandInputHeight()));
             if (inspector->isEmpty())
-                inpectorPos.setY(getHeight() - 30);
+                inpectorPos.setY(getHeight() - getCommandInputHeight() - 30);
             g.setColour(PlugDataColours::sidebarActiveBackgroundColour);
             g.fillRect(inpectorPos.x, inpectorPos.y, getWidth() - 30, 30);
             auto inspectorTitle = inspector->getTitle();
@@ -146,6 +146,11 @@ void Sidebar::paint(Graphics& g)
     }
 }
 
+int Sidebar::getCommandInputHeight()
+{
+    return commandInput->isVisible() ? 46 : 0;
+}
+
 void Sidebar::paintOverChildren(Graphics& g)
 {
     g.setColour(PlugDataColours::toolbarOutlineColour);
@@ -179,7 +184,7 @@ void Sidebar::resized()
     if(sidebarHidden) buttonBarBounds.translate(-24, 0);
 
     if (SettingsFile::getInstance()->getProperty<bool>("centre_sidepanel_buttons")) {
-        buttonBarBounds = buttonBarBounds.withSizeKeepingCentre(30, 144 + 30 + 8 + 30);
+        buttonBarBounds = buttonBarBounds.withSizeKeepingCentre(30, 144 + 30 + 30 + 8 + 30);
     } else {
         buttonBarBounds = buttonBarBounds.withTrimmedTop(34);
     }
@@ -204,13 +209,13 @@ void Sidebar::resized()
         extraSettingsButton->setBounds(panelTitleBarBounds);
     }
 
-    auto const dividerPos = getHeight() * (1.0f - dividerFactor);
-
     if(commandInput->isVisible())
     {
-        commandInput->setBounds(bounds.removeFromBottom(46).reduced(8));
+        commandInput->setBounds(bounds.removeFromBottom(getCommandInputHeight()).reduced(8));
     }
 
+    auto const dividerPos = (getHeight() - getCommandInputHeight()) * (1.0f - dividerFactor);
+
     if (inspector->isVisible()) {
         if (inspectorButton.isInspectorAuto()) {
             if (extraSettingsButton)
@@ -221,7 +226,7 @@ void Sidebar::resized()
             }
             inspector->setBounds(bounds);
         } else {
-            auto bottomB = bounds.removeFromBottom(inspector->isEmpty() ? 30 : dividerPos);
+            auto bottomB = bounds.removeFromBottom(inspector->isEmpty() ? (30 + getCommandInputHeight()) : dividerPos);
             auto resetB = bottomB.removeFromTop(30);
             inspector->setBounds(bottomB);
             auto const resetBounds = resetB.removeFromLeft(30);
@@ -249,13 +254,16 @@ void Sidebar::resized()
 bool Sidebar::hitTest(int x, int y)
 {
     Rectangle<int> buttonBounds;
-    for(auto* button : StackArray<SidebarSelectorButton*, 5>{
+    for(auto* button : StackArray<Component*, 6>{
         &consoleButton,
         &browserButton,
         &automationButton,
         &searchButton,
-        &paletteButton})
-        buttonBounds = buttonBounds.getUnion(button->getBounds());
+        &paletteButton,
+        &inspectorButton})
+    {
+        if(button->isVisible()) buttonBounds = buttonBounds.getUnion(button->getBounds());
+    }
 
     return !isHidden() || buttonBounds.contains(x, y);
 }
@@ -274,7 +282,7 @@ void Sidebar::mouseDown(MouseEvent const& e)
         draggingSidebar = false;
     }
 
-    dragOffset = static_cast<float>(e.getEventRelativeTo(this).y) - dividerFactor * getHeight();
+    dragOffset = static_cast<float>(e.getEventRelativeTo(this).y) - dividerFactor * (getHeight() - getCommandInputHeight());
 }
 
 void Sidebar::mouseDrag(MouseEvent const& e)
@@ -290,7 +298,7 @@ void Sidebar::mouseDrag(MouseEvent const& e)
         getParentComponent()->resized();
     } else if (isDraggingDivider && !inspector->isEmpty()) {
         auto const newDividerY = static_cast<float>(jlimit(30, getHeight() - 30, e.getEventRelativeTo(this).getPosition().y - dragOffset));
-        dividerFactor = newDividerY / getHeight();
+        dividerFactor = newDividerY / (getHeight() - getCommandInputHeight());
         resized();
         repaint();
     }
@@ -310,7 +318,7 @@ void Sidebar::mouseMove(MouseEvent const& e)
     bool const resizeCursor = e.getEventRelativeTo(this).getPosition().getX() < dragbarWidth && e.getEventRelativeTo(this).getPosition().getY() < getHeight() - 30;
 
     auto const pos = e.getEventRelativeTo(this).getPosition();
-    bool const resizeVertical = pos.x > 5 && pos.y > dividerFactor * getHeight() + 3 && pos.y < dividerFactor * getHeight() + 30 - 6;
+    bool const resizeVertical = pos.x > 5 && pos.y > dividerFactor * (getHeight() - getCommandInputHeight()) + 3 && pos.y < dividerFactor * (getHeight() - getCommandInputHeight()) + 30 - 6;
 
     isDraggingDivider = false;
 
@@ -540,7 +548,7 @@ void Sidebar::renderButtonsOnCanvas(NVGcontext* nvg)
 {
     Graphics g(*editor->getNanoLLGC());
 
-    auto b = editor->nvgSurface.getLocalArea(this, getLocalBounds()).withSizeKeepingCentre(36, 186).translated(-15, -15);
+    auto b = editor->nvgSurface.getLocalArea(this, getLocalBounds()).withSizeKeepingCentre(36, 186).translated(-15, -30);
 
     StackShadow::drawShadowForRect(g, b.reduced(3.0f), 10, Corners::largeCornerRadius, 0.4f, 1);
 

Source/Sidebar/Sidebar.h

@@ -54,14 +54,6 @@ class InspectorButton final : public Component
         onClick();
     }
 
-    bool hitTest(int const x, int const y) override
-    {
-        if (getLocalBounds().reduced(3, 4).contains(Point<int>(x, y)))
-            return true;
-
-        return false;
-    }
-
     void mouseEnter(MouseEvent const& e) override
     {
         isHovering = true;
@@ -145,7 +137,7 @@ class InspectorButton final : public Component
         int const textWidth = getWidth() - 4;
 
         if (textWidth > 0)
-            g.drawFittedText(icon, 2, yIndent, textWidth, getHeight() - yIndent * 2, Justification::centred, 2);
+            g.drawFittedText(icon, 2, yIndent, textWidth, getHeight() - yIndent * 2, Justification::centred, 1);
 
         if (state == InspectorOff) {
             auto const b = getLocalBounds().toFloat().reduced(10.5f).translated(-0.5f, 0.5f);
@@ -307,6 +299,8 @@ class Sidebar final : public Component
     static constexpr int dragbarWidth = 6;
 
 private:
+
+    int getCommandInputHeight();
     void updateExtraSettingsButton();
 
     PluginProcessor* pd;

Source/Toolbar.cpp

@@ -980,7 +980,7 @@ class PowerButton final : public Component
     {
         auto* editor = findParentComponentOfClass<PluginEditor>();
         auto content = std::make_unique<AudioSettingsCallout>(editor);
-        editor->showCalloutBox(std::move(content), chevron.getScreenBounds());
+        editor->showCalloutBox(std::move(content), chevron.getScreenBounds().translated(-26, 0));
     }
 
     PluginProcessor* pd;