From 9771a7f44006d2cc7e1ace62d13227cf6efffda3 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 31 Jan 2021 15:01:30 -0500
Subject: [PATCH] Expanded chat font size options including Monospace and Huge
---
indra/llrender/llfontgl.cpp | 2 +-
indra/llui/llconsole.cpp | 24 +++++++++++--------
indra/newview/llchatbar.cpp | 3 +++
indra/newview/llfloaterimnearbychat.cpp | 1 +
indra/newview/llfloaterpreference.cpp | 4 ----
indra/newview/llviewerchat.cpp | 6 +++++
indra/newview/llviewercontrol.cpp | 6 +++++
.../default/xui/en/panel_preferences_chat.xml | 10 +++++++-
8 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 71569e98cff..dc7c3d739f5 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1019,7 +1019,7 @@ LLFontGL* LLFontGL::getFontSansSerifBig()
//static
LLFontGL* LLFontGL::getFontSansSerifHuge()
{
- static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Large",0));
+ static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Huge",0));
return fontp;
}
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
index 2d8abd8fedc..f407cd87ec2 100644
--- a/indra/llui/llconsole.cpp
+++ b/indra/llui/llconsole.cpp
@@ -103,22 +103,26 @@ void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent)
void LLConsole::setFontSize(S32 size_index)
{
- if (-1 == size_index)
+ switch (size_index)
{
+ case -1:
mFont = LLFontGL::getFontMonospace();
- }
- else if (0 == size_index)
- {
+ break;
+ case 0:
+ mFont = LLFontGL::getFontSansSerifSmall();
+ break;
+ default:
+ case 1:
mFont = LLFontGL::getFontSansSerif();
- }
- else if (1 == size_index)
- {
+ break;
+ case 2:
mFont = LLFontGL::getFontSansSerifBig();
- }
- else
- {
+ break;
+ case 3:
mFont = LLFontGL::getFontSansSerifHuge();
+ break;
}
+
// Make sure the font exists
if (mFont == NULL)
{
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 5eb98222bd5..453907f800c 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -59,6 +59,7 @@
#include "llmultigesture.h"
#include "llui.h"
#include "lluictrlfactory.h"
+#include "llviewerchat.h"
// [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0b)
#include "rlvactions.h"
#include "rlvcommon.h"
@@ -133,6 +134,8 @@ BOOL LLChatBar::postBuild()
mInputEditor->setMaxTextLength(DB_CHAT_MSG_STR_LEN);
mInputEditor->setEnableLineHistory(TRUE);
+
+ mInputEditor->setFont(LLViewerChat::getChatFont());
mIsBuilt = TRUE;
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index b4bd608e982..5e81eaf8523 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -224,6 +224,7 @@ void LLFloaterIMNearbyChat::reloadMessages(bool clean_messages/* = false*/)
// Update the messages without re-writing them to a log file.
addMessage(*it,false, do_not_log);
}
+ mInputEditor->setFont(LLViewerChat::getChatFont());
}
void LLFloaterIMNearbyChat::loadHistory()
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 643faec7d62..8104526f7ed 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -538,10 +538,6 @@ void LLFloaterPreference::saveAvatarProperties( void )
BOOL LLFloaterPreference::postBuild()
{
- gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLFloaterIMSessionTab::processChatHistoryStyleUpdate, false));
-
- gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&LLViewerChat::signalChatFontChanged));
-
gSavedSettings.getControl("ChatBubbleOpacity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onNameTagOpacityChange, this, _2));
gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeMaturity, this));
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 43752292bbb..9a1ce367376 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -190,6 +190,9 @@ LLFontGL* LLViewerChat::getChatFont()
LLFontGL* fontp = NULL;
switch(font_size)
{
+ case -1:
+ fontp = LLFontGL::getFontMonospace();
+ break;
case 0:
fontp = LLFontGL::getFontSansSerifSmall();
break;
@@ -200,6 +203,9 @@ LLFontGL* LLViewerChat::getChatFont()
case 2:
fontp = LLFontGL::getFontSansSerifBig();
break;
+ case 3:
+ fontp = LLFontGL::getFontSansSerifHuge();
+ break;
}
return fontp;
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index dd41ec9a4d4..fc5abcdbe48 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -79,6 +79,8 @@
#include "rlvactions.h"
#include "rlvcommon.h"
// [/RLVa:KB]
+#include "llfloaterimsessiontab.h"
+#include "llviewerchat.h"
// Third party library includes
#include <boost/algorithm/string.hpp>
@@ -342,6 +344,10 @@ static bool handleChatFontSizeChanged(const LLSD& newvalue)
{
gConsole->setFontSize(newvalue.asInteger());
}
+
+ LLViewerChat::signalChatFontChanged();
+ LLFloaterIMSessionTab::processChatHistoryStyleUpdate(false);
+
return true;
}
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 9dab2f284ed..feeeb3cf296 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -68,6 +68,10 @@
name="chat_font_size"
top_pad="5"
width="100">
+ <item
+ label="Monospace"
+ name="Monospace"
+ value="-1"/>
<item
label="Small"
name="Small"
@@ -79,7 +83,11 @@
<item
label="Large"
name="Large"
- value="2"/>
+ value="2"/>
+ <item
+ label="Huge"
+ name="Huge"
+ value="3"/>
</combo_box>
<check_box
--
GitLab