Merge pull request #97 from rmpowell77/dev/font

Issue #95: Text needs to customize font
rmpowell77 · Mar 10, 2023 · 728ec67 · 728ec67
2 parents 4b9c806 + 0d07315
commit 728ec67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/LATEST_RELEASE_NOTES.md b/LATEST_RELEASE_NOTES.md
@@ -20,4 +20,5 @@ Other changes:
 * [#82](../../issues/82) wxCheckBox needs a setValue
 * [#89](../../issues/89) Change stack to sizer
 * [#92](../../issues/92) Need a Bitmap
+* [#95](../../issues/95) Text needs to customize font
 
diff --git a/include/wxUI/Widget.h b/include/wxUI/Widget.h
@@ -157,6 +157,12 @@ struct WidgetDetails {
         return static_cast<ConcreteWidget&>(*this);
     }
 
+    auto withFont(wxFontInfo const& fontInfo_) -> ConcreteWidget&
+    {
+        fontInfo = fontInfo_;
+        return static_cast<ConcreteWidget&>(*this);
+    }
+
     auto getHandle(Underlying** handle) -> ConcreteWidget&
     {
         windowHandle = handle;
@@ -166,6 +172,9 @@ struct WidgetDetails {
     auto createAndAdd(wxWindow* parent, wxSizer* sizer, wxSizerFlags const& parentFlags)
     {
         auto widget = dynamic_cast<Underlying*>(create(parent));
+        if (fontInfo) {
+            widget->SetFont(wxFont(*fontInfo));
+        }
         sizer->Add(widget, flags ? *flags : parentFlags);
         if (windowHandle) {
             *windowHandle = widget;
@@ -189,6 +198,7 @@ struct WidgetDetails {
     wxPoint pos = wxDefaultPosition;
     wxSize size = wxDefaultSize;
     int64_t style {};
+    std::optional<wxFontInfo> fontInfo {};
     Underlying** windowHandle {};
 };