Themes support for components

cmake/yup.cmake

@@ -68,12 +68,3 @@ function (_yup_setup_platform)
     set (yup_platform "${yup_platform}" PARENT_SCOPE)
 endfunction()
 
-#==============================================================================
-
-include (${CMAKE_CURRENT_LIST_DIR}/yup_utilities.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_platforms.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_dependencies.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_modules.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_standalone.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_audio_plugin.cmake)
-include (${CMAKE_CURRENT_LIST_DIR}/yup_embed_binary.cmake)

examples/graphics/source/main.cpp

@@ -137,7 +137,6 @@ class CustomWindow
 
         setTitle ("main");
 
-        // Load the font
         yup::File fontFilePath =
 #if JUCE_WASM
             yup::File ("/data")
@@ -146,7 +145,7 @@ class CustomWindow
 #endif
             .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());
 
         // Initialize the audio device

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -37,14 +37,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef JUCE_AUDIO_BASICS_H_INCLUDED
 /* 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.
- */
+*/
 #error "Incorrect use of JUCE cpp file"
 #endif
+// clang-format on
 
 #include "juce_audio_basics.h"
 

modules/juce_audio_devices/juce_audio_devices.cpp

@@ -37,14 +37,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef JUCE_AUDIO_DEVICES_H_INCLUDED
     /* 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.
- */
+*/
 #error "Incorrect use of JUCE cpp file"
 #endif
+// clang-format on
 
 #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1
 #define JUCE_CORE_INCLUDE_COM_SMART_PTR 1
@@ -114,6 +116,7 @@
 #include "native/juce_DirectSound_windows.cpp"
 #endif
 
+    // clang-format off
 #if JUCE_USE_WINRT_MIDI && (JUCE_MSVC || JUCE_CLANG)
         /* If you cannot find any of the header files below then you are probably
    attempting to use the Windows 10 Bluetooth Low Energy API. For this to work you
@@ -136,10 +139,12 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4467)
 #include <robuffer.h>
 JUCE_END_IGNORE_WARNINGS_MSVC
 #endif
+// clang-format on
 
 #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
 #include "native/juce_Midi_windows.cpp"
 
+    // clang-format off
 #if JUCE_ASIO
         /* This is very frustrating - we only need to use a handful of definitions from
    a couple of the header files in Steinberg's ASIO SDK, and it'd be easy to copy
@@ -163,9 +168,11 @@ JUCE_END_IGNORE_WARNINGS_MSVC
 #include <iasiodrv.h>
 #include "native/juce_ASIO_windows.cpp"
 #endif
+// clang-format oon
 
 //==============================================================================
 #elif JUCE_LINUX || JUCE_BSD
+// clang-format off
 #if JUCE_ALSA
 /* Got an include error here? If so, you've either not got ALSA installed, or you've
    not got your paths set up correctly to find its header files.
@@ -195,15 +202,16 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 #endif
 
 #if (JUCE_LINUX && JUCE_BELA)
-    /* Got an include error here? If so, you've either not got the bela headers
-     installed, or you've not got your paths set up correctly to find its header
-     files.
-  */
+/* Got an include error here? If so, you've either not got the bela headers
+   installed, or you've not got your paths set up correctly to find its header
+   files.
+*/
 #include <Bela.h>
 #include <Midi.h>
 #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
 #include "native/juce_Bela_linux.cpp"
 #endif
+// clang-format on
 
 #undef SIZEOF
 

modules/juce_core/juce_core.cpp

@@ -37,14 +37,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef JUCE_CORE_H_INCLUDED
 /* 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.
- */
+*/
 #error "Incorrect use of JUCE cpp file"
 #endif
+// clang-format on
 
 #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1
 #define JUCE_CORE_INCLUDE_COM_SMART_PTR 1

modules/juce_core/memory/juce_ReferenceCountedObject.h

@@ -144,7 +144,7 @@ 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;
     }

modules/juce_events/juce_events.cpp

@@ -37,14 +37,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef JUCE_EVENTS_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.
- */
+*/
 #error "Incorrect use of JUCE cpp file"
 #endif
+// clang-format on
 
 #define JUCE_CORE_INCLUDE_OBJC_HELPERS 1
 #define JUCE_CORE_INCLUDE_JNI_HELPERS 1

modules/yup_audio_plugin_client/yup_audio_plugin_client.cpp

@@ -19,14 +19,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef YUP_AUDIO_PLUGIN_CLIENT_H_INCLUDED
 /* 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.
- */
+*/
 #error "Incorrect use of YUP cpp file"
 #endif
+// clang-format on
 
 #include "yup_audio_plugin_client.h"
 

modules/yup_audio_processors/yup_audio_processors.cpp

@@ -19,14 +19,16 @@
   ==============================================================================
 */
 
+// clang-format off
 #ifdef YUP_AUDIO_PROCESSORS_H_INCLUDED
 /* 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.
- */
+*/
 #error "Incorrect use of YUP cpp file"
 #endif
+// clang-format on
 
 #include "yup_audio_processors.h"
 

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

@@ -19,19 +19,25 @@
   ==============================================================================
 */
 
+// clang-format off
 #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
     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.
- */
+*/
 #error "Incorrect use of YUP cpp file"
 #endif
+// clang-format on
 
 #include "yup_graphics.h"
 
 //==============================================================================
 
+#include <rive/text/font_hb.hpp>
+
+//==============================================================================
+
 #if JUCE_WINDOWS
 
 #if YUP_RIVE_USE_D3D

modules/yup_gui/component/yup_Component.cpp

@@ -495,6 +495,35 @@ bool Component::hasFocus() const
 
 //==============================================================================
 
+Color Component::findColor (const Identifier& colorId) const
+{
+    if (auto color = getColor (colorId))
+        return *color;
+
+    if (parentComponent != nullptr)
+        return parentComponent->findColor (colorId);
+
+    return ApplicationTheme::findColor (colorId);
+}
+
+void Component::setColor (const Identifier& colorId, const std::optional<Color>& color)
+{
+    if (color)
+        properties.set (colorId, static_cast<int64> (color->getARGB()));
+    else
+        properties.remove (colorId);
+}
+
+std::optional<Color> Component::getColor (const Identifier& colorId) const
+{
+    if (auto color = properties.getVarPointer (colorId); color != nullptr && color->isInt64())
+        return Color (static_cast<uint32> (static_cast<int64> (*color)));
+
+    return std::nullopt;
+}
+
+//==============================================================================
+
 NamedValueSet& Component::getProperties()
 {
     return properties;

modules/yup_gui/component/yup_Component.h

@@ -147,6 +147,12 @@ class JUCE_API Component
     void leaveFocus();
     bool hasFocus() const;
 
+    //==============================================================================
+    Color findColor (const Identifier& colorId) const;
+
+    void setColor (const Identifier& colorId, const std::optional<Color>& color);
+    std::optional<Color> getColor (const Identifier& colorId) const;
+
     //==============================================================================
     NamedValueSet& getProperties();
     const NamedValueSet& getProperties() const;

modules/yup_gui/native/yup_Windowing_glfw.cpp

@@ -1458,6 +1458,9 @@ void initialiseYup_Windowing()
     // Initialise glfw
     glfwInit();
 
+    // Initialize global theme
+    ApplicationTheme::setGlobalTheme (createThemeVersion1());
+
     // Setup monitor callback
     {
         Desktop::getInstance()->updateDisplays();