Merge branch 'develop-1.5.0' of http://github.com/vsicurella/Terpstra…

…SysEx.2014 into develop-1.5.0
vsicurella · Jul 18, 2024 · 9c31617 · 9c31617
2 parents c5beb17 + eff870f
commit 9c31617
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
@@ -81,10 +81,10 @@ void MainWindow::closeButtonPressed()
     JUCEApplication::getInstance()->systemRequestedQuit();
 }
 
-BorderSize<int> MainWindow::getBorderThickness() const
-{
-    return BorderSize <int>(1);
-}
+//BorderSize<int> MainWindow::getBorderThickness() const
+//{
+//    return BorderSize <int>(1);
+//}
 
 bool MainWindow::isLargerThanCurrentScreen() const
 {

diff --git a/Source/MainWindow.h b/Source/MainWindow.h
@@ -35,11 +35,11 @@ class MainWindow : public juce::DocumentWindow
 public:
     MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* commandManager);
 
-    virtual ~MainWindow() override;
+    ~MainWindow() override;
 
     void closeButtonPressed() override;
 
-    juce::BorderSize<int> getBorderThickness() const override;
+//    juce::BorderSize<int> getBorderThickness() const override;
 
     /* Note: Be careful if you override any DocumentWindow methods - the base
     class uses a lot of them, so by overriding you might break its functionality.

diff --git a/Source/lumatone_editor_library/data/lumatone_layout.cpp b/Source/lumatone_editor_library/data/lumatone_layout.cpp
@@ -683,6 +683,8 @@ bool LumatoneLayout::fromStringArray(const juce::StringArray& stringArray)
     //        boards[boardIndex].theKeys[55] = TerpstraKey();
     //    }
     //}
+
+    return true;
 }
 
 juce::StringArray LumatoneLayout::toStringArray() const
-Original file line number
+Diff line change
@@ Expand Up @@
         //        boards[boardIndex].theKeys[55] = TerpstraKey();
         //    }
         //}
+        return true;
     }
     juce::StringArray LumatoneLayout::toStringArray() const
@@ Expand Down @@