From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lltoastscripttextbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltoastscripttextbox.cpp') diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp index eb86a44055..b5f18f7502 100644 --- a/indra/newview/lltoastscripttextbox.cpp +++ b/indra/newview/lltoastscripttextbox.cpp @@ -58,7 +58,7 @@ LLToastScriptTextbox::LLToastScriptTextbox(const LLNotificationPtr& notification LLStyle::Params style; style.font = pMessageText->getFont(); - pMessageText->appendText(message, TRUE, style); + pMessageText->appendText(message, true, style); //submit button LLButton* pSubmitBtn = getChild("btn_submit"); -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/lltoastscripttextbox.cpp | 264 ++++++++++++++++----------------- 1 file changed, 132 insertions(+), 132 deletions(-) (limited to 'indra/newview/lltoastscripttextbox.cpp') diff --git a/indra/newview/lltoastscripttextbox.cpp b/indra/newview/lltoastscripttextbox.cpp index 9956962e49..de555ca895 100644 --- a/indra/newview/lltoastscripttextbox.cpp +++ b/indra/newview/lltoastscripttextbox.cpp @@ -1,132 +1,132 @@ -/** - * @file lltoastscripttextbox.cpp - * @brief Panel for script llTextBox dialogs - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "lltoastscripttextbox.h" - -#include "lldbstrings.h" -#include "lllslconstants.h" -#include "llnotifications.h" -#include "llstyle.h" -#include "lluiconstants.h" -#include "llviewertexteditor.h" - -const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT= 14; - -LLToastScriptTextbox::LLToastScriptTextbox(const LLNotificationPtr& notification) -: LLToastPanel(notification) -{ - buildFromFile( "panel_notify_textbox.xml"); - - mInfoText = getChild("text_editor_box"); - mInfoText->setMaxTextLength(LLToastPanel::MAX_TEXT_LENGTH); - mInfoText->setValue(notification->getMessage()); - - getChild("ignore_btn")->setClickedCallback(boost::bind(&LLToastScriptTextbox::onClickIgnore, this)); - - const LLSD& payload = notification->getPayload(); - - //message body - const std::string& message = payload["message"].asString(); - - LLViewerTextEditor* pMessageText = getChild("message"); - pMessageText->clear(); - - LLStyle::Params style; - style.font = pMessageText->getFont(); - pMessageText->appendText(message, true, style); - - //submit button - LLButton* pSubmitBtn = getChild("btn_submit"); - pSubmitBtn->setClickedCallback((boost::bind(&LLToastScriptTextbox::onClickSubmit, this))); - setDefaultBtn(pSubmitBtn); - - snapToMessageHeight(); -} - -// virtual -LLToastScriptTextbox::~LLToastScriptTextbox() -{ -} - -void LLToastScriptTextbox::close() -{ - die(); -} - -void LLToastScriptTextbox::onClickSubmit() -{ - LLViewerTextEditor* pMessageText = getChild("message"); - - if (pMessageText) - { - LLSD response = mNotification->getResponseTemplate(); - response[TEXTBOX_MAGIC_TOKEN] = pMessageText->getText(); - if (response[TEXTBOX_MAGIC_TOKEN].asString().empty()) - { - // so we can distinguish between a successfully - // submitted blank textbox, and an ignored toast - response[TEXTBOX_MAGIC_TOKEN] = true; - } - mNotification->respond(response); - close(); - LL_WARNS() << response << LL_ENDL; - } -} - -void LLToastScriptTextbox::onClickIgnore() -{ - LLSD response = mNotification->getResponseTemplate(); - mNotification->respond(response); - close(); -} - -void LLToastScriptTextbox::snapToMessageHeight() -{ - LLPanel* info_pan = getChild("info_panel"); - if (!info_pan) - { - return; - } - - S32 maxLinesCount; - std::istringstream ss( getString("message_max_lines_count") ); - if (!(ss >> maxLinesCount)) - { - maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT; - } - - - S32 maxTextHeight = (mInfoText->getFont()->getLineHeight() * maxLinesCount); - S32 oldTextHeight = mInfoText->getRect().getHeight(); - S32 newTextHeight = llmin(mInfoText->getTextBoundingRect().getHeight(), maxTextHeight); - - S32 heightDelta = newTextHeight - oldTextHeight; - - reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT)); - info_pan->reshape(info_pan->getRect().getWidth(),newTextHeight); -} +/** + * @file lltoastscripttextbox.cpp + * @brief Panel for script llTextBox dialogs + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "lltoastscripttextbox.h" + +#include "lldbstrings.h" +#include "lllslconstants.h" +#include "llnotifications.h" +#include "llstyle.h" +#include "lluiconstants.h" +#include "llviewertexteditor.h" + +const S32 LLToastScriptTextbox::DEFAULT_MESSAGE_MAX_LINE_COUNT= 14; + +LLToastScriptTextbox::LLToastScriptTextbox(const LLNotificationPtr& notification) +: LLToastPanel(notification) +{ + buildFromFile( "panel_notify_textbox.xml"); + + mInfoText = getChild("text_editor_box"); + mInfoText->setMaxTextLength(LLToastPanel::MAX_TEXT_LENGTH); + mInfoText->setValue(notification->getMessage()); + + getChild("ignore_btn")->setClickedCallback(boost::bind(&LLToastScriptTextbox::onClickIgnore, this)); + + const LLSD& payload = notification->getPayload(); + + //message body + const std::string& message = payload["message"].asString(); + + LLViewerTextEditor* pMessageText = getChild("message"); + pMessageText->clear(); + + LLStyle::Params style; + style.font = pMessageText->getFont(); + pMessageText->appendText(message, true, style); + + //submit button + LLButton* pSubmitBtn = getChild("btn_submit"); + pSubmitBtn->setClickedCallback((boost::bind(&LLToastScriptTextbox::onClickSubmit, this))); + setDefaultBtn(pSubmitBtn); + + snapToMessageHeight(); +} + +// virtual +LLToastScriptTextbox::~LLToastScriptTextbox() +{ +} + +void LLToastScriptTextbox::close() +{ + die(); +} + +void LLToastScriptTextbox::onClickSubmit() +{ + LLViewerTextEditor* pMessageText = getChild("message"); + + if (pMessageText) + { + LLSD response = mNotification->getResponseTemplate(); + response[TEXTBOX_MAGIC_TOKEN] = pMessageText->getText(); + if (response[TEXTBOX_MAGIC_TOKEN].asString().empty()) + { + // so we can distinguish between a successfully + // submitted blank textbox, and an ignored toast + response[TEXTBOX_MAGIC_TOKEN] = true; + } + mNotification->respond(response); + close(); + LL_WARNS() << response << LL_ENDL; + } +} + +void LLToastScriptTextbox::onClickIgnore() +{ + LLSD response = mNotification->getResponseTemplate(); + mNotification->respond(response); + close(); +} + +void LLToastScriptTextbox::snapToMessageHeight() +{ + LLPanel* info_pan = getChild("info_panel"); + if (!info_pan) + { + return; + } + + S32 maxLinesCount; + std::istringstream ss( getString("message_max_lines_count") ); + if (!(ss >> maxLinesCount)) + { + maxLinesCount = DEFAULT_MESSAGE_MAX_LINE_COUNT; + } + + + S32 maxTextHeight = (mInfoText->getFont()->getLineHeight() * maxLinesCount); + S32 oldTextHeight = mInfoText->getRect().getHeight(); + S32 newTextHeight = llmin(mInfoText->getTextBoundingRect().getHeight(), maxTextHeight); + + S32 heightDelta = newTextHeight - oldTextHeight; + + reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT)); + info_pan->reshape(info_pan->getRect().getWidth(),newTextHeight); +} -- cgit v1.2.3