Themes support for components

examples/graphics/source/main.cpp

@@ -47,21 +47,21 @@ class CustomWindow
             return;
         }
 
+        /*
 #if JUCE_WASM
         yup::File dataPath = yup::File ("/data");
 #else
         yup::File dataPath = yup::File (__FILE__).getParentDirectory().getSiblingFile ("data");
 #endif
-
         yup::File fontFilePath = dataPath.getChildFile ("Roboto-Regular.ttf");
-
-        if (auto result = font.loadFromFile (fontFilePath, factory); result.failed())
+        if (auto result = font.loadFromFile (fontFilePath); result.failed())
             yup::Logger::outputDebugString (result.getErrorMessage());
+        */
 
         setTitle ("main");
 
         for (int i = 0; i < totalRows * totalColumns; ++i)
-            addAndMakeVisible (sliders.add (std::make_unique<yup::Slider> (yup::String (i), font)));
+            addAndMakeVisible (sliders.add (std::make_unique<yup::Slider> (yup::String (i))));
 
         //button = std::make_unique<yup::TextButton> ("xyz", font);
         //addAndMakeVisible (*button);

modules/juce_core/memory/juce_ReferenceCountedObject.h

@@ -88,15 +88,15 @@ class JUCE_API ReferenceCountedObject
         This is done automatically by the smart pointer, but is public just
         in case it's needed for nefarious purposes.
     */
-    void incReferenceCount() noexcept
+    void incReferenceCount() const noexcept
     {
         ++refCount;
     }
 
     /** Decreases the object's reference count.
         If the count gets to zero, the object will be deleted.
     */
-    void decReferenceCount() noexcept
+    void decReferenceCount() const noexcept
     {
         jassert (getReferenceCount() > 0);
 
@@ -108,7 +108,7 @@ class JUCE_API ReferenceCountedObject
         If the count gets to zero, the object will not be deleted, but this method
         will return true, allowing the caller to take care of deletion.
     */
-    bool decReferenceCountWithoutDeleting() noexcept
+    bool decReferenceCountWithoutDeleting() const noexcept
     {
         jassert (getReferenceCount() > 0);
         return --refCount == 0;
@@ -144,14 +144,14 @@ class JUCE_API ReferenceCountedObject
     /** Resets the reference count to zero without deleting the object.
         You should probably never need to use this!
     */
-    void resetReferenceCount() noexcept
+    void resetReferenceCount() const noexcept
     {
         refCount = 0;
     }
 
 private:
     //==============================================================================
-    Atomic<int> refCount { 0 };
+    mutable Atomic<int> refCount { 0 };
     friend struct ContainerDeletePolicy<ReferenceCountedObject>;
 };
 
@@ -177,15 +177,15 @@ class JUCE_API SingleThreadedReferenceCountedObject
         This is done automatically by the smart pointer, but is public just
         in case it's needed for nefarious purposes.
     */
-    void incReferenceCount() noexcept
+    void incReferenceCount() const noexcept
     {
         ++refCount;
     }
 
     /** Decreases the object's reference count.
         If the count gets to zero, the object will be deleted.
     */
-    void decReferenceCount() noexcept
+    void decReferenceCount() const noexcept
     {
         jassert (getReferenceCount() > 0);
 
@@ -197,7 +197,7 @@ class JUCE_API SingleThreadedReferenceCountedObject
         If the count gets to zero, the object will not be deleted, but this method
         will return true, allowing the caller to take care of deletion.
     */
-    bool decReferenceCountWithoutDeleting() noexcept
+    bool decReferenceCountWithoutDeleting() const noexcept
     {
         jassert (getReferenceCount() > 0);
         return --refCount == 0;
@@ -232,7 +232,7 @@ class JUCE_API SingleThreadedReferenceCountedObject
 
 private:
     //==============================================================================
-    int refCount = 0;
+    mutable int refCount = 0;
     friend struct ContainerDeletePolicy<ReferenceCountedObject>;
 };
 

modules/yup_graphics/fonts/yup_Font.cpp

@@ -24,25 +24,25 @@ namespace yup
 
 //==============================================================================
 
-Font::Font (const MemoryBlock& fontBytes, rive::Factory* factory)
+Font::Font (const MemoryBlock& fontBytes)
 {
-    loadFromData (fontBytes, factory);
+    loadFromData (fontBytes);
 }
 
-Font::Font (const File& fontFile, rive::Factory* factory)
+Font::Font (const File& fontFile)
 {
-    loadFromFile (fontFile, factory);
+    loadFromFile (fontFile);
 }
 
 //==============================================================================
 
-Result Font::loadFromData (const MemoryBlock& fontBytes, rive::Factory* factory)
+Result Font::loadFromData (const MemoryBlock& fontBytes)
 {
-    font = factory->decodeFont (rive::Span<const uint8_t> { static_cast<const uint8_t*> (fontBytes.getData()), fontBytes.getSize() });
+    font = HBFont::Decode (rive::Span<const uint8_t> { static_cast<const uint8_t*> (fontBytes.getData()), fontBytes.getSize() });
     return font ? Result::ok() : Result::fail ("Unable to load font");
 }
 
-Result Font::loadFromFile (const File& fontFile, rive::Factory* factory)
+Result Font::loadFromFile (const File& fontFile)
 {
     if (! fontFile.existsAsFile())
         return Result::fail ("Unable to load font from non existing file");
@@ -52,7 +52,7 @@ Result Font::loadFromFile (const File& fontFile, rive::Factory* factory)
         yup::MemoryBlock mb;
         is->readIntoMemoryBlock (mb);
 
-        font = factory->decodeFont (rive::Span<const uint8_t> { static_cast<const uint8_t*> (mb.getData()), mb.getSize() });
+        font = HBFont::Decode (rive::Span<const uint8_t> { static_cast<const uint8_t*> (mb.getData()), mb.getSize() });
         if (! font)
             return Result::fail ("Unable to load font");
     }

modules/yup_graphics/fonts/yup_Font.h

@@ -31,8 +31,8 @@ class JUCE_API Font
     Font() = default;
 
     //==============================================================================
-    Font (const MemoryBlock& fontBytes, rive::Factory* factory);
-    Font (const File& fontFile, rive::Factory* factory);
+    Font (const MemoryBlock& fontBytes);
+    Font (const File& fontFile);
 
     //==============================================================================
     /** Copy and move constructors and assignment operators. */
@@ -42,10 +42,10 @@ class JUCE_API Font
     Font& operator= (Font&& other) noexcept = default;
 
     //==============================================================================
-    Result loadFromData (const MemoryBlock& fontBytes, rive::Factory* factory);
+    Result loadFromData (const MemoryBlock& fontBytes);
 
     //==============================================================================
-    Result loadFromFile (const File& fontFile, rive::Factory* factory);
+    Result loadFromFile (const File& fontFile);
 
     //==============================================================================
     rive::rcp<rive::Font> getFont() const;

modules/yup_graphics/yup_graphics.cpp

@@ -20,7 +20,7 @@
 */
 
 #ifdef YUP_GRAPHICS_H_INCLUDED
-    /* When you add this cpp file to your project, you mustn't include it in a file where you've
+/* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix
     header files that the compiler may be using.
@@ -32,6 +32,10 @@
 
 //==============================================================================
 
+#include <rive/text/font_hb.hpp>
+
+//==============================================================================
+
 #if JUCE_WINDOWS
 #include <array>
 #include <dxgi1_2.h>

modules/yup_gui/native/yup_Windowing_glfw.cpp

@@ -1332,6 +1332,8 @@ void initialiseYup_Windowing()
     glfwWindowHint (GLFW_CONTEXT_VERSION_MINOR, 6);
 #endif
 
+    ApplicationTheme::setGlobalTheme (createThemeVersion1());
+
     Desktop::getInstance()->updateDisplays();
 
     glfwSetMonitorCallback (+[] (GLFWmonitor* monitor, int event)

modules/yup_gui/themes/theme_v1/yup_ThemeVersion1.cpp

@@ -0,0 +1,122 @@
+/*
+  ==============================================================================
+
+   This file is part of the YUP library.
+   Copyright (c) 2024 - [email protected]
+
+   YUP is an open source library subject to open-source licensing.
+
+   The code included in this file is provided under the terms of the ISC license
+   http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+   to use, copy, modify, and/or distribute this software for any purpose with or
+   without fee is hereby granted provided that the above copyright notice and
+   this permission notice appear in all copies.
+
+   YUP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+namespace yup
+{
+
+//==============================================================================
+
+extern const uint8_t RobotoRegularFont_data[];
+extern const std::size_t RobotoRegularFont_size;
+
+//==============================================================================
+
+ApplicationTheme::Ptr createThemeVersion1()
+{
+    auto theme = new ApplicationTheme;
+
+    Font font;
+    if (auto result = font.loadFromData (MemoryBlock (&RobotoRegularFont_data[0], RobotoRegularFont_size)); result.failed())
+        yup::Logger::outputDebugString (result.getErrorMessage());
+
+    theme->setDefaultFont (std::move (font));
+
+    theme->setComponentTheme<Slider::Theme> ({ [theme] (Graphics& g, const Slider& s)
+                                               {
+                                                   auto bounds = s.getLocalBounds().reduced (s.proportionOfWidth (0.1f));
+                                                   const auto center = bounds.getCenter();
+
+                                                   constexpr auto fromRadians = degreesToRadians (135.0f);
+                                                   constexpr auto toRadians = fromRadians + degreesToRadians (270.0f);
+
+                                                   Path backgroundPath;
+                                                   backgroundPath.addEllipse (bounds.reduced (s.proportionOfWidth (0.105f)));
+
+                                                   g.setFillColor (Color (0xff3d3d3d));
+                                                   g.fillPath (backgroundPath);
+
+                                                   g.setStrokeColor (Color (0xff2b2b2b));
+                                                   g.setStrokeWidth (s.proportionOfWidth (0.0175f));
+                                                   g.strokePath (backgroundPath);
+
+                                                   Path backgroundArc;
+                                                   backgroundArc.addCenteredArc (center,
+                                                                                 bounds.getWidth() / 2.0f,
+                                                                                 bounds.getHeight() / 2.0f,
+                                                                                 0.0f,
+                                                                                 fromRadians,
+                                                                                 toRadians,
+                                                                                 true);
+
+                                                   g.setStrokeCap (StrokeCap::Round);
+                                                   g.setStrokeColor (Color (0xff636363));
+                                                   g.setStrokeWidth (s.proportionOfWidth (0.075f));
+                                                   g.strokePath (backgroundArc);
+
+                                                   const auto toCurrentRadians = fromRadians + degreesToRadians (270.0f) * s.getValue();
+
+                                                   Path foregroundArc;
+                                                   foregroundArc.addCenteredArc (center,
+                                                                                 bounds.getWidth() / 2.0f,
+                                                                                 bounds.getHeight() / 2.0f,
+                                                                                 0.0f,
+                                                                                 fromRadians,
+                                                                                 toCurrentRadians,
+                                                                                 true);
+
+                                                   g.setStrokeCap (StrokeCap::Round);
+                                                   g.setStrokeColor (s.isMouseOver() ? Color (0xff4ebfff).brighter (0.3f) : Color (0xff4ebfff));
+                                                   g.setStrokeWidth (s.proportionOfWidth (0.075f));
+                                                   g.strokePath (foregroundArc);
+
+                                                   const auto reducedBounds = bounds.reduced (s.proportionOfWidth (0.175f));
+                                                   const auto pos = center.getPointOnCircumference (
+                                                       reducedBounds.getWidth() / 2.0f,
+                                                       reducedBounds.getHeight() / 2.0f,
+                                                       toCurrentRadians);
+
+                                                   Path foregroundLine;
+                                                   foregroundLine.addLine (Line<float> (pos, center).keepOnlyStart (0.25f));
+
+                                                   g.setStrokeCap (StrokeCap::Round);
+                                                   g.setStrokeColor (Color (0xffffffff));
+                                                   g.setStrokeWidth (s.proportionOfWidth (0.03f));
+                                                   g.strokePath (foregroundLine);
+
+                                                   StyledText text;
+                                                   text.appendText (theme->getDefaultFont(), s.proportionOfHeight (0.1f), s.proportionOfHeight (0.1f), String (s.getValue(), 3).toRawUTF8());
+                                                   text.layout (s.getLocalBounds().reduced (5).removeFromBottom (s.proportionOfWidth (0.1f)), StyledText::center);
+
+                                                   g.setStrokeColor (Color (0xffffffff));
+                                                   g.strokeFittedText (text, s.getLocalBounds().reduced (5).removeFromBottom (s.proportionOfWidth (0.1f)));
+
+                                                   if (s.hasFocus())
+                                                   {
+                                                       g.setStrokeColor (Color (0xffff5f2b));
+                                                       g.setStrokeWidth (s.proportionOfWidth (0.0175f));
+                                                       g.strokeRect (s.getLocalBounds());
+                                                   }
+                                               } });
+
+    return theme;
+}
+
+} // namespace yup

modules/yup_gui/themes/theme_v1/yup_ThemeVersion1.h

@@ -0,0 +1,29 @@
+/*
+  ==============================================================================
+
+   This file is part of the YUP library.
+   Copyright (c) 2024 - [email protected]
+
+   YUP is an open source library subject to open-source licensing.
+
+   The code included in this file is provided under the terms of the ISC license
+   http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+   to use, copy, modify, and/or distribute this software for any purpose with or
+   without fee is hereby granted provided that the above copyright notice and
+   this permission notice appear in all copies.
+
+   YUP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+namespace yup
+{
+
+//==============================================================================
+
+ApplicationTheme::Ptr createThemeVersion1();
+
+} // namespace yup

modules/yup_gui/themes/theme_v1/yup_ThemeVersion1_Resources.cpp

@@ -0,0 +1,33 @@
+/*
+  ==============================================================================
+
+   This file is part of the YUP library.
+   Copyright (c) 2024 - [email protected]
+
+   YUP is an open source library subject to open-source licensing.
+
+   The code included in this file is provided under the terms of the ISC license
+   http://www.isc.org/downloads/software-support-policy/isc-license. Permission
+   to use, copy, modify, and/or distribute this software for any purpose with or
+   without fee is hereby granted provided that the above copyright notice and
+   this permission notice appear in all copies.
+
+   YUP IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER
+   EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE
+   DISCLAIMED.
+
+  ==============================================================================
+*/
+
+namespace yup
+{
+
+//==============================================================================
+
+const uint8_t RobotoRegularFont_data[] = {
+#include "RobotoRegularFont.inc"
+};
+
+const std::size_t RobotoRegularFont_size = sizeof (RobotoRegularFont_data);
+
+} // namespace yup