From 977168eda4a3ae22cdd8e50e682dd31c466f306a Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Wed, 27 Mar 2024 18:49:18 +0100 Subject: secondlife/viewer#944 Display should be consistent between llDialog text and llDialog buttons --- indra/newview/lltoastnotifypanel.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index a5a637c6fa..4a6c2ada8a 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -102,9 +102,9 @@ protected: //std::vector mButtons; // panel elements - LLTextBase* mTextBox; - LLPanel* mInfoPanel; // a panel, that contains an information - LLPanel* mControlPanel; // a panel, that contains buttons (if present) + LLTextBase* mTextBox { nullptr }; + LLPanel* mInfoPanel { nullptr }; // panel for text information + LLPanel* mControlPanel { nullptr }; // panel for buttons (if present) // internal handler for button being clicked static void onClickButton(void* data); @@ -124,17 +124,17 @@ protected: */ //void disableRespondedOptions(const LLNotificationPtr& notification); - bool mIsTip; - bool mAddedDefaultBtn; - bool mIsScriptDialog; - bool mIsCaution; + bool mIsTip { false }; + bool mAddedDefaultBtn { false }; + bool mIsScriptDialog { false }; + bool mIsCaution { false }; std::string mMessage; - S32 mNumOptions; - S32 mNumButtons; + S32 mNumOptions { 0 }; + S32 mNumButtons { 0 }; - static const LLFontGL* sFont; - static const LLFontGL* sFontSmall; + static const std::string sFontDefault; + static const std::string sFontScript; }; class LLIMToastNotifyPanel : public LLToastNotifyPanel -- cgit v1.2.3 From 5ad488a4a665f715c943004dce42f703204121cd Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 19 Apr 2024 22:40:49 +0300 Subject: viewer#1290 Fix snapToMessageHeight crash --- indra/newview/lltoastnotifypanel.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index 4a6c2ada8a..8cfd0eb447 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -63,6 +63,7 @@ public: LLToastNotifyPanel(const LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true); virtual void init( LLRect rect, bool show_images ); + virtual void deleteAllChildren(); virtual ~LLToastNotifyPanel(); LLPanel * getControlPanel() { return mControlPanel; } -- cgit v1.2.3 From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/lltoastnotifypanel.h | 192 ++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 96 deletions(-) (limited to 'indra/newview/lltoastnotifypanel.h') diff --git a/indra/newview/lltoastnotifypanel.h b/indra/newview/lltoastnotifypanel.h index a5a637c6fa..952841a012 100644 --- a/indra/newview/lltoastnotifypanel.h +++ b/indra/newview/lltoastnotifypanel.h @@ -5,21 +5,21 @@ * $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$ */ @@ -50,118 +50,118 @@ class LLNotificationForm; class LLToastNotifyPanel: public LLCheckBoxToastPanel, public LLInstanceTracker { public: - /** - * Constructor for LLToastNotifyPanel. - * - * @param pNotification a shared pointer to LLNotification - * @param rect an initial rectangle of the toast panel. - * If it is null then a loaded from xml rectangle will be used. - * @see LLNotification - * @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to - * implement right class for desired toast panel. @see LLGenericTipPanel as example. - */ - LLToastNotifyPanel(const LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true); + /** + * Constructor for LLToastNotifyPanel. + * + * @param pNotification a shared pointer to LLNotification + * @param rect an initial rectangle of the toast panel. + * If it is null then a loaded from xml rectangle will be used. + * @see LLNotification + * @deprecated if you intend to instantiate LLToastNotifyPanel - it's point to + * implement right class for desired toast panel. @see LLGenericTipPanel as example. + */ + LLToastNotifyPanel(const LLNotificationPtr& pNotification, const LLRect& rect = LLRect::null, bool show_images = true); - virtual void init( LLRect rect, bool show_images ); + virtual void init( LLRect rect, bool show_images ); - virtual ~LLToastNotifyPanel(); - LLPanel * getControlPanel() { return mControlPanel; } + virtual ~LLToastNotifyPanel(); + LLPanel * getControlPanel() { return mControlPanel; } - virtual void updateNotification() {} + virtual void updateNotification() {} - bool isControlPanelEnabled() const; + bool isControlPanelEnabled() const; protected: - LLButton* createButton(const LLSD& form_element, BOOL is_option); - - // Used for callbacks - struct InstanceAndS32 - { - LLToastNotifyPanel* mSelf; - std::string mButtonName; - }; - std::vector mBtnCallbackData; - - typedef std::pair index_button_pair_t; - void adjustPanelForScriptNotice(S32 max_width, S32 max_height); - void adjustPanelForTipNotice(); - void addDefaultButton(); - /* - * It lays out buttons of the notification in mControlPanel. - * Buttons will be placed from BOTTOM to TOP. - * @param h_pad horizontal space between buttons. It is depend on number of buttons. - * @param buttons vector of button to be added. - */ - void updateButtonsLayout(const std::vector& buttons, S32 h_pad); - - /** - * Disable specific button(s) based on notification name and clicked button - */ - //void disableButtons(const std::string& notification_name, const std::string& selected_button); - - //std::vector mButtons; - - // panel elements - LLTextBase* mTextBox; - LLPanel* mInfoPanel; // a panel, that contains an information - LLPanel* mControlPanel; // a panel, that contains buttons (if present) - - // internal handler for button being clicked - static void onClickButton(void* data); - - typedef boost::signals2::signal - button_click_signal_t; - static button_click_signal_t sButtonClickSignal; - boost::signals2::connection mButtonClickConnection; - - /** - * handle sButtonClickSignal (to disable buttons) across all panels with given notification_id - */ - void onToastPanelButtonClicked(const LLUUID& notification_id, const std::string btn_name); - - /** - * Process response data. Will disable selected options - */ - //void disableRespondedOptions(const LLNotificationPtr& notification); - - bool mIsTip; - bool mAddedDefaultBtn; - bool mIsScriptDialog; - bool mIsCaution; - - std::string mMessage; - S32 mNumOptions; - S32 mNumButtons; - - static const LLFontGL* sFont; - static const LLFontGL* sFontSmall; + LLButton* createButton(const LLSD& form_element, BOOL is_option); + + // Used for callbacks + struct InstanceAndS32 + { + LLToastNotifyPanel* mSelf; + std::string mButtonName; + }; + std::vector mBtnCallbackData; + + typedef std::pair index_button_pair_t; + void adjustPanelForScriptNotice(S32 max_width, S32 max_height); + void adjustPanelForTipNotice(); + void addDefaultButton(); + /* + * It lays out buttons of the notification in mControlPanel. + * Buttons will be placed from BOTTOM to TOP. + * @param h_pad horizontal space between buttons. It is depend on number of buttons. + * @param buttons vector of button to be added. + */ + void updateButtonsLayout(const std::vector& buttons, S32 h_pad); + + /** + * Disable specific button(s) based on notification name and clicked button + */ + //void disableButtons(const std::string& notification_name, const std::string& selected_button); + + //std::vector mButtons; + + // panel elements + LLTextBase* mTextBox; + LLPanel* mInfoPanel; // a panel, that contains an information + LLPanel* mControlPanel; // a panel, that contains buttons (if present) + + // internal handler for button being clicked + static void onClickButton(void* data); + + typedef boost::signals2::signal + button_click_signal_t; + static button_click_signal_t sButtonClickSignal; + boost::signals2::connection mButtonClickConnection; + + /** + * handle sButtonClickSignal (to disable buttons) across all panels with given notification_id + */ + void onToastPanelButtonClicked(const LLUUID& notification_id, const std::string btn_name); + + /** + * Process response data. Will disable selected options + */ + //void disableRespondedOptions(const LLNotificationPtr& notification); + + bool mIsTip; + bool mAddedDefaultBtn; + bool mIsScriptDialog; + bool mIsCaution; + + std::string mMessage; + S32 mNumOptions; + S32 mNumButtons; + + static const LLFontGL* sFont; + static const LLFontGL* sFontSmall; }; class LLIMToastNotifyPanel : public LLToastNotifyPanel { public: - LLIMToastNotifyPanel(LLNotificationPtr& pNotification, - const LLUUID& session_id, - const LLRect& rect = LLRect::null, - bool show_images = true, - LLTextBase* parent_text = NULL); + LLIMToastNotifyPanel(LLNotificationPtr& pNotification, + const LLUUID& session_id, + const LLRect& rect = LLRect::null, + bool show_images = true, + LLTextBase* parent_text = NULL); - void compactButtons(); + void compactButtons(); - virtual void updateNotification(); - virtual void init( LLRect rect, bool show_images ); + virtual void updateNotification(); + virtual void init( LLRect rect, bool show_images ); - ~LLIMToastNotifyPanel(); + ~LLIMToastNotifyPanel(); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); protected: - LLTextBase* mParentText; - LLUUID mSessionID; + LLTextBase* mParentText; + LLUUID mSessionID; private: - void snapToMessageHeight(); + void snapToMessageHeight(); }; #endif /* LLTOASTNOTIFYPANEL_H_ */ -- cgit v1.2.3