[viewer] Add dynamic background colour to script canvas

neo-sonar · Oct 24, 2023 · 6810183 · 6810183
1 parent a1d9e5a
commit 6810183
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/tools/jml-viewer/Viewer/LuaScriptViewer.cpp b/tools/jml-viewer/Viewer/LuaScriptViewer.cpp
@@ -9,8 +9,16 @@ constexpr auto const* DefaultScriptPath = R"(~/Developer/neo-sonar/jml/examples/
 
 LuaScriptViewer::LuaScriptViewer() : _scriptFile(DefaultScriptPath)
 {
+    _viewportColour.setValue(toVar(getSchemeWidgetBackgroundColour()));
+    _viewportProperties.addProperties(juce::Array<juce::PropertyComponent*>{
+        std::make_unique<ColourPropertyComponent>(_viewportColour, "Background").release(),
+    });
+
+    _viewportColour.addListener(this);
+
     addAndMakeVisible(_viewport);
     addAndMakeVisible(_componentTree);
+    addAndMakeVisible(_viewportProperties);
     startTimer(2000);
 }
 
@@ -64,8 +72,11 @@ auto LuaScriptViewer::paint(juce::Graphics& g) -> void
 
 auto LuaScriptViewer::resized() -> void
 {
-    auto area = getLocalBounds();
-    _componentTree.setBounds(area.removeFromRight(area.proportionOfWidth(0.2)));
+    auto area     = getLocalBounds();
+    auto treeArea = area.removeFromRight(area.proportionOfWidth(0.2));
+
+    _viewportProperties.setBounds(treeArea.removeFromBottom(treeArea.proportionOfHeight(0.15)));
+    _componentTree.setBounds(treeArea);
     _viewport.setBounds(area);
 }
 
@@ -77,6 +88,13 @@ auto LuaScriptViewer::timerCallback() -> void
     _lua->state.collect_garbage();
 }
 
+auto LuaScriptViewer::valueChanged(juce::Value& value) -> void
+{
+    if (value.refersToSameSourceAs(_viewportColour)) {
+        _viewport.setBackgroundColour(fromVar<juce::Colour>(_viewportColour));
+    }
+}
+
 auto LuaScriptViewer::reloadLuaState() -> void
 {
     _lua = std::make_unique<LuaState>();

diff --git a/tools/jml-viewer/Viewer/LuaScriptViewer.hpp b/tools/jml-viewer/Viewer/LuaScriptViewer.hpp
@@ -13,6 +13,7 @@ namespace jml::viewer {
 struct LuaScriptViewer final
     : juce::Component
     , juce::Timer
+    , juce::Value::Listener
 {
     LuaScriptViewer();
     ~LuaScriptViewer() override = default;
@@ -24,6 +25,7 @@ struct LuaScriptViewer final
     auto paint(juce::Graphics& g) -> void override;
     auto resized() -> void override;
     auto timerCallback() -> void override;
+    auto valueChanged(juce::Value& value) -> void override;
 
 private:
     struct LuaState
@@ -37,8 +39,12 @@ struct LuaScriptViewer final
     static auto handleLuaError(sol::error const& error) -> void;
 
     std::unique_ptr<LuaState> _lua;
+
     ScriptViewport _viewport;
     ComponentTree _componentTree;
+    juce::PropertyPanel _viewportProperties;
+
+    juce::Value _viewportColour;
 
     juce::File _scriptFile;
     std::unique_ptr<FileChangeListener> _fileListener;

diff --git a/tools/jml-viewer/Viewer/ScriptViewport.cpp b/tools/jml-viewer/Viewer/ScriptViewport.cpp
@@ -4,6 +4,8 @@
 
 namespace jml::viewer {
 
+ScriptViewport::ScriptViewport() : _background{getSchemeWidgetBackgroundColour()} {}
+
 auto ScriptViewport::setViewedComponent(juce::Component* component) -> void
 {
     if (_component != nullptr) {
@@ -15,11 +17,14 @@ auto ScriptViewport::setViewedComponent(juce::Component* component) -> void
     }
 }
 
-auto ScriptViewport::paint(juce::Graphics& g) -> void
+auto ScriptViewport::setBackgroundColour(juce::Colour colour) -> void
 {
-    g.fillAll(getSchemeWidgetBackgroundColour());
+    _background = colour;
+    repaint();
 }
 
+auto ScriptViewport::paint(juce::Graphics& g) -> void { g.fillAll(_background); }
+
 auto ScriptViewport::resized() -> void
 {
     if (_component == nullptr) {

diff --git a/tools/jml-viewer/Viewer/ScriptViewport.hpp b/tools/jml-viewer/Viewer/ScriptViewport.hpp
@@ -6,16 +6,18 @@ namespace jml::viewer {
 
 struct ScriptViewport final : juce::Component
 {
-    ScriptViewport()           = default;
+    ScriptViewport();
     ~ScriptViewport() override = default;
 
     auto setViewedComponent(juce::Component* component) -> void;
+    auto setBackgroundColour(juce::Colour colour) -> void;
 
     auto paint(juce::Graphics& g) -> void override;
     auto resized() -> void override;
 
 private:
     juce::Component* _component{nullptr};
+    juce::Colour _background;
 };
 
 } // namespace jml::viewer