diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-08-02 19:29:21 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2023-08-02 19:29:21 +1000 |
commit | 994c533a0f7b4aa1a1530405505a53546252e1d1 (patch) | |
tree | 3e190174ef93a35f53b842c61098544df8216356 /source/windowing | |
parent | 856e93be3f1a443db2679ad7db9f6890a9b4d936 (diff) |
Improve planet name title
They began showing during the warp cinematic and their fade-out timing was wrong.
Diffstat (limited to 'source/windowing')
-rw-r--r-- | source/windowing/StarItemSlotWidget.cpp | 2 | ||||
-rw-r--r-- | source/windowing/StarLabelWidget.cpp | 6 | ||||
-rw-r--r-- | source/windowing/StarLabelWidget.hpp | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/source/windowing/StarItemSlotWidget.cpp b/source/windowing/StarItemSlotWidget.cpp index 4d67175..2958957 100644 --- a/source/windowing/StarItemSlotWidget.cpp +++ b/source/windowing/StarItemSlotWidget.cpp @@ -189,6 +189,8 @@ void ItemSlotWidget::renderImpl() { context()->setFontColor(m_fontColor.toRgba()); context()->setFontMode(m_countFontMode); context()->renderInterfaceText(toString(m_item->count()), m_countPosition.translated(Vec2F(screenPosition()))); + context()->setFontMode(FontMode::Normal); + context()->setDefaultFont(); } } else if (m_drawBackingImageWhenEmpty && m_backingImage != "") { diff --git a/source/windowing/StarLabelWidget.cpp b/source/windowing/StarLabelWidget.cpp index cfc273c..30b1451 100644 --- a/source/windowing/StarLabelWidget.cpp +++ b/source/windowing/StarLabelWidget.cpp @@ -41,6 +41,10 @@ void LabelWidget::setFontSize(int fontSize) { updateTextRegion(); } +void LabelWidget::setFontMode(FontMode fontMode) { + m_fontMode = fontMode; +} + void LabelWidget::setColor(Color newColor) { m_color = move(newColor); } @@ -82,6 +86,7 @@ RectI LabelWidget::getScissorRect() const { void LabelWidget::renderImpl() { context()->setFont(m_font); context()->setFontSize(m_fontSize); + context()->setFontMode(m_fontMode); context()->setFontColor(m_color.toRgba()); context()->setFontProcessingDirectives(m_processingDirectives); @@ -93,6 +98,7 @@ void LabelWidget::renderImpl() { context()->renderInterfaceText(m_text, {Vec2F(screenPosition()), m_hAnchor, m_vAnchor, m_wrapWidth, m_textCharLimit}); context()->setDefaultFont(); + context()->setFontMode(FontMode::Normal); context()->setFontProcessingDirectives(""); context()->setDefaultLineSpacing(); } diff --git a/source/windowing/StarLabelWidget.hpp b/source/windowing/StarLabelWidget.hpp index 725354c..de692ce 100644 --- a/source/windowing/StarLabelWidget.hpp +++ b/source/windowing/StarLabelWidget.hpp @@ -19,6 +19,7 @@ public: Maybe<unsigned> getTextCharLimit() const; void setText(String newText); void setFontSize(int fontSize); + void setFontMode(FontMode fontMode); void setColor(Color newColor); void setAnchor(HorizontalAnchor hAnchor, VerticalAnchor vAnchor); void setWrapWidth(Maybe<unsigned> wrapWidth); @@ -37,6 +38,7 @@ private: String m_text; int m_fontSize; + FontMode m_fontMode; Color m_color; HorizontalAnchor m_hAnchor; VerticalAnchor m_vAnchor; |