Add validate / add-to-list drop zones to drag-and-drop validation

Author: drowaudio

CHANGELIST.md

@@ -1,6 +1,7 @@
 # pluginval Change List
 
 ### 1.0.5
+- Added drag-and-drop of plug-in files onto the main window, with two drop zones to either validate the plug-in or add it to the plugin list [#170]
 - Added static linking to the Windows runtime so it should run on more Windows systems (particularly non-dev machines)
 - Made `PluginInfoTest` run on the message thread as the functions it calls aren't thread-safe 
 

Source/CommandLine.cpp

@@ -534,10 +534,10 @@ static void performCommandLine (CommandLineValidator& validator, const juce::Arg
     cli.addCommand ({ "--strictness-help",
                       "--strictness-help [level]",
                       "Lists all tests that run at the given strictness level.", juce::String(),
-                      [] (const auto& args)
+                      [] (const auto& commandArgs)
                       {
                           int level = 5;
-                          auto arg = getArgumentAfterOption (args, "--strictness-help");
+                          auto arg = getArgumentAfterOption (commandArgs, "--strictness-help");
                           if (arg.text.isNotEmpty() && ! arg.isShortOption() && ! arg.isLongOption())
                               level = arg.text.getIntValue();
                           printStrictnessHelp (level);

Source/MainComponent.cpp

@@ -352,7 +352,7 @@ MainComponent::MainComponent (Validator& v)
         {
             strictnessDialog = std::make_unique<StrictnessInfoDialog> (
                 getStrictnessLevel(),
-                [this, updateStrictnessButtonText] (int newLevel)
+                [updateStrictnessButtonText] (int newLevel)
                 {
                     setStrictnessLevel (newLevel);
                     updateStrictnessButtonText();
@@ -384,26 +384,45 @@ void MainComponent::paint (juce::Graphics& g)
 
 void MainComponent::paintOverChildren (juce::Graphics& g)
 {
-    if (! dragHighlight)
+    if (dragAction == DropAction::none)
         return;
 
     constexpr float cornerRadius = 10.0f;
-    constexpr float borderThickness = 3.0f;
     constexpr float inset = 6.0f;
-    const auto accent = juce::Colour (0xff4a9eff);
+    constexpr float gap = 8.0f;
+    const auto accent = juce::Colour (0xff4a9eff).withAlpha (0.9f);
 
-    auto r = getLocalBounds().withTrimmedTop (menuBar.getBottom())
-                             .toFloat()
-                             .reduced (inset);
+    auto area = getDragOverlayBounds().toFloat().reduced (inset);
 
-    g.setColour (accent.withAlpha (0.12f));
-    g.fillRoundedRectangle (r, cornerRadius);
+    auto leftHalf = area.removeFromLeft ((area.getWidth() - gap) * 0.5f);
+    area.removeFromLeft (gap);
+    auto rightHalf = area;
 
-    g.setColour (accent);
-    g.drawRoundedRectangle (r, cornerRadius, borderThickness);
+    auto drawZone = [&] (juce::Rectangle<float> zone, const juce::String& title,
+                         const juce::String& subtitle, bool active)
+    {
+        auto bgCol = accent.withMultipliedSaturation (active ? 1.0f : 0.2f);
+        g.setColour (bgCol);
+        g.fillRoundedRectangle (zone, cornerRadius);
+
+        g.setColour (accent);
+        g.drawRoundedRectangle (zone, cornerRadius, active ? 3.0f : 1.5f);
+
+        auto textArea = zone.reduced (12.0f);
+        auto titleArea = textArea.removeFromTop (textArea.getHeight() * 0.5f);
+
+        g.setColour (bgCol.contrasting().withAlpha (active ? 1.0f : 0.6f));
+        g.setFont (juce::Font (juce::FontOptions (24.0f, juce::Font::bold)));
+        g.drawText (title, titleArea, juce::Justification::centredBottom);
 
-    g.setFont (juce::Font (juce::FontOptions (22.0f, juce::Font::bold)));
-    g.drawText ("Drop plug-in to validate", r, juce::Justification::centred);
+        g.setFont (juce::Font (juce::FontOptions (14.0f)));
+        g.drawText (subtitle, textArea, juce::Justification::centredTop);
+    };
+
+    drawZone (leftHalf, "Validate", "Run validation now",
+              dragAction == DropAction::validate);
+    drawZone (rightHalf, "Add to List", "Scan into the plug-in list",
+              dragAction == DropAction::addToList);
 }
 
 void MainComponent::resized()
@@ -468,31 +487,55 @@ bool MainComponent::isInterestedInFileDrag (const juce::StringArray& files)
     return false;
 }
 
-void MainComponent::fileDragEnter (const juce::StringArray& files, int, int)
+juce::Rectangle<int> MainComponent::getDragOverlayBounds() const
 {
-    const bool shouldHighlight = isInterestedInFileDrag (files);
+    return getLocalBounds().withTrimmedTop (menuBar.getBottom());
+}
 
-    if (dragHighlight != shouldHighlight)
+MainComponent::DropAction MainComponent::dropActionForX (int x) const
+{
+    return x < getDragOverlayBounds().getCentreX() ? DropAction::validate
+                                                   : DropAction::addToList;
+}
+
+void MainComponent::updateDragAction (const juce::StringArray& files, int x)
+{
+    const auto newAction = isInterestedInFileDrag (files) ? dropActionForX (x)
+                                                          : DropAction::none;
+
+    if (dragAction != newAction)
     {
-        dragHighlight = shouldHighlight;
+        dragAction = newAction;
         repaint();
     }
 }
 
+void MainComponent::fileDragEnter (const juce::StringArray& files, int x, int)
+{
+    updateDragAction (files, x);
+}
+
+void MainComponent::fileDragMove (const juce::StringArray& files, int x, int)
+{
+    updateDragAction (files, x);
+}
+
 void MainComponent::fileDragExit (const juce::StringArray&)
 {
-    if (dragHighlight)
+    if (dragAction != DropAction::none)
     {
-        dragHighlight = false;
+        dragAction = DropAction::none;
         repaint();
     }
 }
 
-void MainComponent::filesDropped (const juce::StringArray& files, int, int)
+void MainComponent::filesDropped (const juce::StringArray& files, int x, int)
 {
-    if (dragHighlight)
+    const auto action = dropActionForX (x);
+
+    if (dragAction != DropAction::none)
     {
-        dragHighlight = false;
+        dragAction = DropAction::none;
         repaint();
     }
 
@@ -507,12 +550,17 @@ void MainComponent::filesDropped (const juce::StringArray& files, int, int)
 
     getAppPreferences().setValue ("lastPluginLocation", pluginFiles[pluginFiles.size() - 1]);
 
-    juce::OwnedArray<juce::PluginDescription> typesFound;
-    knownPluginList.scanAndAddDragAndDroppedFiles (formatManager, pluginFiles, typesFound);
-    savePluginList();
-
-    validator.setValidateInProcess (getValidateInProcess());
-    validator.validate (pluginFiles, getTestOptions());
+    if (action == DropAction::addToList)
+    {
+        juce::OwnedArray<juce::PluginDescription> typesFound;
+        knownPluginList.scanAndAddDragAndDroppedFiles (formatManager, pluginFiles, typesFound);
+        savePluginList();
+    }
+    else
+    {
+        validator.setValidateInProcess (getValidateInProcess());
+        validator.validate (pluginFiles, getTestOptions());
+    }
 }
 
 //==============================================================================

Source/MainComponent.h

@@ -405,6 +405,7 @@ class MainComponent   : public juce::Component,
     // FileDragAndDropTarget
     bool isInterestedInFileDrag (const juce::StringArray& files) override;
     void fileDragEnter (const juce::StringArray& files, int x, int y) override;
+    void fileDragMove (const juce::StringArray& files, int x, int y) override;
     void fileDragExit (const juce::StringArray& files) override;
     void filesDropped (const juce::StringArray& files, int x, int y) override;
 
@@ -426,9 +427,16 @@ class MainComponent   : public juce::Component,
                strictnessInfoButton { "Strictness" };
     StatusBar statusBar { validator };
     std::unique_ptr<StrictnessInfoDialog> strictnessDialog;
-    bool dragHighlight = false;
+
+    // Which action a drop will perform, based on which half of the window the
+    // drag is over. DropAction::none means no plug-in drag is in progress.
+    enum class DropAction { none, validate, addToList };
+    DropAction dragAction = DropAction::none;
 
     static bool isPluginFile (const juce::String& path);
+    juce::Rectangle<int> getDragOverlayBounds() const;
+    DropAction dropActionForX (int x) const;
+    void updateDragAction (const juce::StringArray& files, int x);
 
     void savePluginList();
     juce::PopupMenu createFileMenu();

Source/PluginvalLookAndFeel.h

@@ -44,7 +44,6 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         const auto textColour       = juce::Colour (0xffe0e0e0);
         const auto textDimmed       = juce::Colour (0xff909090);
         const auto accentColour     = juce::Colour (0xffffffff);
-        const auto highlightColour  = getAccentColour().withAlpha (0.3f);
 
         // Window colours
         setColour (juce::ResizableWindow::backgroundColourId, backgroundDark);
@@ -194,7 +193,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         g.drawEllipse (juce::Rectangle<float> (thumbWidth, thumbWidth).withCentre (thumbPoint), 1.0f);
     }
 
-    void drawTabButton (juce::TabBarButton& button, juce::Graphics& g, bool isMouseOver, bool isMouseDown) override
+    void drawTabButton (juce::TabBarButton& button, juce::Graphics& g, bool isMouseOver, bool /*isMouseDown*/) override
     {
         auto area = button.getActiveArea().toFloat();
         auto backgroundColour = findColour (juce::ResizableWindow::backgroundColourId);
@@ -219,7 +218,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
         g.drawText (button.getButtonText(), area.reduced (12.0f, 0.0f), juce::Justification::centred);
     }
 
-    int getTabButtonBestWidth (juce::TabBarButton& button, int tabDepth) override
+    int getTabButtonBestWidth (juce::TabBarButton& button, int /*tabDepth*/) override
     {
         auto width = juce::GlyphArrangement::getStringWidthInt (juce::Font (juce::FontOptions (14.0f)), button.getButtonText()) + 40;  // Extra padding
         return juce::jmax (width, 80);
@@ -236,7 +235,7 @@ class PluginvalLookAndFeel : public juce::LookAndFeel_V4
     }
 
     void drawTableHeaderColumn (juce::Graphics& g, juce::TableHeaderComponent& header,
-                                const juce::String& columnName, int columnId,
+                                const juce::String& columnName, int /*columnId*/,
                                 int width, int height, bool isMouseOver, bool isMouseDown,
                                 int columnFlags) override
     {