Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shove textbox pointer of notifies into a member var

Browse Source 
Used in future commit, separated for ease of reading
This commit is contained in:
Liru Færs
2019-12-22 21:08:44 -05:00
parent a432c3429c
commit b1862ce1c1
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llnotify.cpp
View File

@@ -226,23 +226,23 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification)
const S32 MAX_LENGTH = 512 + 20 + DB_FIRST_NAME_BUF_SIZE + DB_LAST_NAME_BUF_SIZE + DB_INV_ITEM_NAME_BUF_SIZE; // For script dialogs: add space for title. const S32 MAX_LENGTH = 512 + 20 + DB_FIRST_NAME_BUF_SIZE + DB_LAST_NAME_BUF_SIZE + DB_INV_ITEM_NAME_BUF_SIZE; // For script dialogs: add space for title.
auto text = new LLTextEditor(std::string("box"), LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16), MAX_LENGTH, LLStringUtil::null, sFont, FALSE, true); mText = new LLTextEditor(std::string("box"), LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16), MAX_LENGTH, LLStringUtil::null, sFont, FALSE, true);
text->setWordWrap(TRUE); mText->setWordWrap(TRUE);
text->setMouseOpaque(TRUE); mText->setMouseOpaque(TRUE);
text->setBorderVisible(FALSE); mText->setBorderVisible(FALSE);
text->setTakesNonScrollClicks(TRUE); mText->setTakesNonScrollClicks(TRUE);
text->setHideScrollbarForShortDocs(TRUE); mText->setHideScrollbarForShortDocs(TRUE);
text->setReadOnlyBgColor ( LLColor4::transparent ); // the background color of the box is manually mText->setReadOnlyBgColor ( LLColor4::transparent ); // the background color of the box is manually
// rendered under the text box, therefore we want // rendered under the text box, therefore we want
// the actual text box to be transparent // the actual text box to be transparent
auto text_color = gColors.getColor(mIsCaution && mIsTip ? "NotifyCautionWarnColor" : "NotifyTextColor"); auto text_color = gColors.getColor(mIsCaution && mIsTip ? "NotifyCautionWarnColor" : "NotifyTextColor");
text->setReadOnlyFgColor(text_color); //sets caution text color for tip notifications mText->setReadOnlyFgColor(text_color); //sets caution text color for tip notifications
if (!mIsCaution) // We could do some extra color math here to determine if bg's too close to link color, but let's just cross with the link color instead if (!mIsCaution) // We could do some extra color math here to determine if bg's too close to link color, but let's just cross with the link color instead
text->setLinkColor(new LLColor4(lerp(text_color, gSavedSettings.getColor4("HTMLLinkColor"), 0.4f))); mText->setLinkColor(new LLColor4(lerp(text_color, gSavedSettings.getColor4("HTMLLinkColor"), 0.4f)));
text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard) mText->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
text->appendText(message,false,false,nullptr,!layout_script_dialog); // Now we can set the text, since colors have been set. mText->appendText(message,false,false,nullptr,!layout_script_dialog); // Now we can set the text, since colors have been set.
addChild(text); addChild(mText);
} }
if (mIsTip) if (mIsTip)

2
indra/newview/llnotify.h
View File

@@ -92,7 +92,7 @@ private:
void drawBackground() const; void drawBackground() const;
protected: protected:
LLTextEditor *mUserInputBox; LLTextEditor *mUserInputBox = nullptr, *mText = nullptr;
LLNotificationPtr mNotification; LLNotificationPtr mNotification;
bool mIsTip; bool mIsTip;