Add support for JUCE 8.0.2

ImJimmi · Sep 30, 2024 · f61a3f3 · f61a3f3
1 parent d93bace
commit f61a3f3
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 13 deletions.
diff --git a/jive_core/CMakeLists.txt b/jive_core/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(jive_core
                       algorithms/jive_Interpolate.h
                       algorithms/jive_TransferFunction.h
                       algorithms/jive_Visitor.h
+                      compile-time-helpers/jive_JuceVersion.h
                       geometry/jive_BorderRadii.h
                       geometry/jive_BoxModel.cpp
                       geometry/jive_BoxModel.h

diff --git a/jive_core/compile-time-helpers/jive_JuceVersion.h b/jive_core/compile-time-helpers/jive_JuceVersion.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define JIVE_JUCE_VERSION(major, minor, patch) ((major << 16) + (minor << 8) + patch)
diff --git a/jive_core/graphics/jive_FontUtilities.cpp b/jive_core/graphics/jive_FontUtilities.cpp
@@ -1,6 +1,6 @@
 #include "jive_FontUtilities.h"
 
-#include <juce_graphics/juce_graphics.h>
+#include <jive_core/compile-time-helpers/jive_JuceVersion.h>
 
 namespace jive
 {
@@ -18,4 +18,13 @@ namespace jive
 
         return flags;
     }
+
+    float calculateStringWidth(const juce::String& text, const juce::Font& font)
+    {
+#if JUCE_VERSION > JIVE_JUCE_VERSION(8, 0, 1)
+        return juce::GlyphArrangement::getStringWidth(font, text);
+#else
+        return font.getStringWidthFloat(text);
+#endif
+    }
 } // namespace jive
diff --git a/jive_core/graphics/jive_FontUtilities.h b/jive_core/graphics/jive_FontUtilities.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <juce_core/juce_core.h>
+#include <juce_graphics/juce_graphics.h>
 
 namespace jive
 {
-    int parseFontStyleFlags(const juce::String& styleString);
+    [[nodiscard]] int parseFontStyleFlags(const juce::String& styleString);
+    [[nodiscard]] float calculateStringWidth(const juce::String& text, const juce::Font& font);
 } // namespace jive
diff --git a/jive_core/jive_core.h b/jive_core/jive_core.h
@@ -12,6 +12,7 @@ END_JUCE_MODULE_DECLARATION */
 
 #include <juce_gui_basics/juce_gui_basics.h>
 
+#include "compile-time-helpers/jive_JuceVersion.h"
 #include "logging/jive_ConsoleProgressBar.h"
 #include "logging/jive_ScopeIndentedLogger.h"
 #include "logging/jive_StringStreams.h"

diff --git a/jive_core/values/jive_Object.h b/jive_core/values/jive_Object.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <jive_core/compile-time-helpers/jive_JuceVersion.h>
+
 #include <juce_data_structures/juce_data_structures.h>
 
 namespace jive
@@ -23,8 +25,13 @@ namespace jive
         Object(Object&& other);
         Object(const juce::DynamicObject& other);
 
+#if JUCE_VERSION > JIVE_JUCE_VERSION(8, 0, 1)
+        void setProperty(const juce::Identifier& propertyName,
+                         const juce::var& newValue);
+#else
         void setProperty(const juce::Identifier& propertyName,
                          const juce::var& newValue) override;
+#endif
         const juce::NamedValueSet& getProperties() const;
 
         Object* getParent() noexcept;

diff --git a/jive_core/values/jive_Property.cpp b/jive_core/values/jive_Property.cpp
@@ -319,7 +319,7 @@ class PropertyUnitTest : public juce::UnitTest
             };
             state["object"].getDynamicObject()->setProperty("foo", 111);
             expect(!receivedCallback);
-            state["object"].getDynamicObject()->setProperty("value", 11358);
+            dynamic_cast<jive::Object*>(state["object"].getDynamicObject())->setProperty("value", 11358);
             expect(receivedCallback);
         }
 
@@ -342,10 +342,10 @@ class PropertyUnitTest : public juce::UnitTest
             value.onValueChange = [&receivedCallback]() {
                 receivedCallback = true;
             };
-            state["object"]["inner"].getDynamicObject()->setProperty("value", 11358);
+            dynamic_cast<jive::Object*>(state["object"]["inner"].getDynamicObject())->setProperty("value", 11358);
             expect(receivedCallback);
             receivedCallback = false;
-            state["object"].getDynamicObject()->setProperty("value", 34544);
+            dynamic_cast<jive::Object*>(state["object"].getDynamicObject())->setProperty("value", 34544);
             expect(receivedCallback);
         }
 

diff --git a/jive_layouts/layout/gui-items/content/jive_Text.cpp b/jive_layouts/layout/gui-items/content/jive_Text.cpp
@@ -180,6 +180,7 @@ namespace jive
 } // namespace jive
 
 #if JIVE_UNIT_TESTS
+    #include <jive_core/graphics/jive_FontUtilities.h>
     #include <jive_layouts/layout/jive_Interpreter.h>
 
 class TextTest : public juce::UnitTest
@@ -525,14 +526,14 @@ class TextTest : public juce::UnitTest
 
             const auto& boxModel = jive::boxModel(item);
             expectEquals(boxModel.getWidth(),
-                         std::ceil(font.getStringWidthFloat("This side up.")));
+                         std::ceil(jive::calculateStringWidth("This side up.", font)));
             expectEquals(boxModel.getHeight(), std::ceil(font.getHeight()));
 
             textTree.setProperty("text", "This one spans\nmultiple lines.", nullptr);
             expectEquals(boxModel.getWidth(),
                          std::ceil(std::max({
-                             font.getStringWidthFloat("This one spans"),
-                             font.getStringWidthFloat("multiple lines."),
+                             jive::calculateStringWidth("This one spans", font),
+                             jive::calculateStringWidth("multiple lines.", font),
                          })));
             expectEquals(boxModel.getHeight(),
                          std::ceil(font.getHeight()) * 2.0f);

diff --git a/jive_layouts/layout/gui-items/flex/jive_FlexContainer.cpp b/jive_layouts/layout/gui-items/flex/jive_FlexContainer.cpp
@@ -606,7 +606,7 @@ class FlexContainerUnitTest : public juce::UnitTest
             const auto& container = *window->getChildren()[0];
             const auto& boxModel = jive::boxModel(container);
             expectEquals(boxModel.getContentBounds().getWidth(),
-                         std::ceil(font.getStringWidthFloat(textState["text"])));
+                         std::ceil(jive::calculateStringWidth(textState["text"], font)));
             expectEquals(boxModel.getContentBounds().getHeight(),
                          font.getHeight());
         }

diff --git a/jive_layouts/layout/gui-items/grid/jive_GridContainer.cpp b/jive_layouts/layout/gui-items/grid/jive_GridContainer.cpp
@@ -938,7 +938,7 @@ class GridContainerTest : public juce::UnitTest
                               ->getTextComponent()
                               .getFont();
 
-        const auto expectedWidth = std::ceil(font.getStringWidthFloat("hello")) + std::ceil(font.getStringWidthFloat("world"));
+        const auto expectedWidth = std::ceil(jive::calculateStringWidth("hello", font)) + std::ceil(jive::calculateStringWidth("world", font));
         expectEquals(boxModel.getContentBounds().getWidth(), expectedWidth);
 
         const auto expectedHeight = std::ceil(font.getHeight()) * 2.0f;

diff --git a/package-lock.cmake b/package-lock.cmake
@@ -1,5 +1,5 @@
 CPMDeclarePackage(JUCE
-                  GIT_TAG 8.0.1
+                  GIT_TAG 8.0.2
                   GITHUB_REPOSITORY juce-framework/JUCE
                   SYSTEM YES
                   EXCLUDE_FROM_ALL YES

diff --git a/runners/demo-runner/CMakeLists.txt b/runners/demo-runner/CMakeLists.txt
@@ -42,7 +42,9 @@ target_link_libraries(jive-demo
                                 juce::juce_recommended_warning_flags
 )
 
-add_melatonin_inspector(jive-demo)
+if (JIVE_ENABLE_MELATONIN_INSPECTOR)
+    add_melatonin_inspector(jive-demo)
+endif ()
 
 juce_add_gui_app(jive-demo-app
                  PRODUCT_NAME
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#pragma once

		#define JIVE_JUCE_VERSION(major, minor, patch) ((major << 16) + (minor << 8) + patch)