STORM-1094 Chat preferences > font size should increase size of input text in IM window
parent
1c375a8c88
commit
567035a2f7
|
|
@ -413,6 +413,7 @@ Jonathan Yap
|
|||
STORM-990
|
||||
STORM-1020
|
||||
STORM-1064
|
||||
STORM-1094
|
||||
Kage Pixel
|
||||
VWR-11
|
||||
Ken March
|
||||
|
|
|
|||
|
|
@ -2290,3 +2290,8 @@ void LLLineEditor::setContextMenu(LLContextMenu* new_context_menu)
|
|||
else
|
||||
mContextMenuHandle.markDead();
|
||||
}
|
||||
|
||||
void LLLineEditor::setFont(const LLFontGL* font)
|
||||
{
|
||||
mGLFont = font;
|
||||
}
|
||||
|
|
@ -201,6 +201,7 @@ public:
|
|||
const LLColor4& getTentativeFgColor() const { return mTentativeFgColor.get(); }
|
||||
|
||||
const LLFontGL* getFont() const { return mGLFont; }
|
||||
void setFont(const LLFontGL* font);
|
||||
|
||||
void setIgnoreArrowKeys(BOOL b) { mIgnoreArrowKeys = b; }
|
||||
void setIgnoreTab(BOOL b) { mIgnoreTab = b; }
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@
|
|||
#include "llrootview.h"
|
||||
#include "llspeakers.h"
|
||||
#include "llsidetray.h"
|
||||
#include "llviewerchat.h"
|
||||
|
||||
|
||||
static const S32 RECT_PADDING_NOT_INIT = -1;
|
||||
|
|
@ -891,6 +892,7 @@ void LLIMFloater::updateChatHistoryStyle()
|
|||
|
||||
void LLIMFloater::processChatHistoryStyleUpdate(const LLSD& newvalue)
|
||||
{
|
||||
LLFontGL* font = LLViewerChat::getChatFont();
|
||||
LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("impanel");
|
||||
for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin();
|
||||
iter != inst_list.end(); ++iter)
|
||||
|
|
@ -899,6 +901,7 @@ void LLIMFloater::processChatHistoryStyleUpdate(const LLSD& newvalue)
|
|||
if (floater)
|
||||
{
|
||||
floater->updateChatHistoryStyle();
|
||||
floater->mInputEditor->setFont(font);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue