From 726c2f44effed78b1700b10703c81b9cc480abc8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 8 Jan 2024 21:52:20 -0500
Subject: [PATCH] Hook up changing notecard font
---
indra/newview/llpreviewnotecard.cpp | 25 +++++++++++++++++++++++++
indra/newview/llpreviewnotecard.h | 3 +++
2 files changed, 28 insertions(+)
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index f3fef23d374..a82d4292e98 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -85,11 +85,36 @@ LLPreviewNotecard::LLPreviewNotecard(const LLSD& key) //const LLUUID& item_id,
LLPreviewNotecard::~LLPreviewNotecard()
{
delete mLiveFile;
+ mFontNameConnection.disconnect();
+ mFontSizeConnection.disconnect();
}
BOOL LLPreviewNotecard::postBuild()
{
mEditor = getChild<LLViewerTextEditor>("Notecard Editor");
+ if (auto fontp = LLFontGL::getFont(LLFontDescriptor(gSavedSettings.getString("NotecardFontName"), gSavedSettings.getString("NotecardFontSize"), 0).normalize()))
+ {
+ mEditor->setFont(fontp);
+ }
+ mFontNameConnection = gSavedSettings.getControl("NotecardFontName")->getCommitSignal()->connect([this](LLControlVariable*, const LLSD& newval, const LLSD&)
+ {
+ std::string text = mEditor->getText();
+ if (auto fontp = LLFontGL::getFont(LLFontDescriptor(newval.asString(), gSavedSettings.getString("NotecardFontSize"), 0).normalize()))
+ {
+ mEditor->setFont(fontp);
+ }
+ mEditor->setText(text);
+ });
+ mFontSizeConnection = gSavedSettings.getControl("NotecardFontSize")->getCommitSignal()->connect([this](LLControlVariable*, const LLSD& newval, const LLSD&)
+ {
+ std::string text = mEditor->getText();
+ if (auto fontp = LLFontGL::getFont(LLFontDescriptor(gSavedSettings.getString("NotecardFontName"), newval.asString(), 0).normalize()))
+ {
+ mEditor->setFont(fontp);
+ }
+ mEditor->setText(text);
+ });
+
mEditor->setNotecardInfo(mItemUUID, mObjectID, getKey());
mEditor->makePristine();
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index be106f169e8..f8e60d56832 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -140,6 +140,9 @@ class LLPreviewNotecard final : public LLPreview, public LLVOInventoryListener
LLUUID mObjectID;
LLLiveLSLFile* mLiveFile;
+
+ boost::signals2::connection mFontNameConnection;
+ boost::signals2::connection mFontSizeConnection;
};
--
GitLab