From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llsplitbutton.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsplitbutton.h') diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h index 4f20c8b379..15d7ddaf52 100644 --- a/indra/newview/llsplitbutton.h +++ b/indra/newview/llsplitbutton.h @@ -80,7 +80,7 @@ public: void onItemSelected(LLUICtrl* ctrl); void setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; } - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); virtual void showButtons(); virtual void hideButtons(); -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llsplitbutton.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsplitbutton.h') diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h index 15d7ddaf52..a4a6a179c1 100644 --- a/indra/newview/llsplitbutton.h +++ b/indra/newview/llsplitbutton.h @@ -71,8 +71,8 @@ public: //Overridden virtual void onFocusLost(); - virtual void setFocus(BOOL b); - virtual void setEnabled(BOOL enabled); + virtual void setFocus(bool b); + virtual void setEnabled(bool enabled); //Callbacks void onArrowBtnDown(); -- 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/llsplitbutton.h | 216 +++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 108 deletions(-) (limited to 'indra/newview/llsplitbutton.h') diff --git a/indra/newview/llsplitbutton.h b/indra/newview/llsplitbutton.h index 0a5a8abdf6..b6ee47a9c7 100644 --- a/indra/newview/llsplitbutton.h +++ b/indra/newview/llsplitbutton.h @@ -1,108 +1,108 @@ -/** - * @file llsplitbutton.h - * @brief LLSplitButton base class - * - * $LicenseInfo:firstyear=2009&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$ - */ - -// A control that displays the name of the chosen item, which when clicked -// shows a scrolling box of choices. - - -#include "llbutton.h" -#include "llpanel.h" -#include "lluictrl.h" - - -#ifndef LL_LLSPLITBUTTON_H -#define LL_LLSPLITBUTTON_H - -class LLSplitButton - : public LLUICtrl -{ -public: - typedef enum e_arrow_position - { - LEFT, - RIGHT - } EArrowPosition; - - struct ArrowPositionValues : public LLInitParam::TypeValuesHelper - { - static void declareValues(); - }; - - struct ItemParams : public LLInitParam::Block - { - ItemParams(); - }; - - struct Params : public LLInitParam::Block - { - Optional arrow_position; - Optional arrow_button; - Optional items_panel; - Multiple items; - - Params(); - }; - - - virtual ~LLSplitButton(); - - //Overridden - virtual void onFocusLost(); - virtual void setFocus(bool b); - virtual void setEnabled(bool enabled); - - //Callbacks - void onArrowBtnDown(); - void onHeldDownShownButton(); - void onItemSelected(LLUICtrl* ctrl); - void setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; } - - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - - virtual void showButtons(); - virtual void hideButtons(); - - -protected: - friend class LLUICtrlFactory; - LLSplitButton(const LLSplitButton::Params& p); - - LLButton* prepareItemButton(LLButton::Params params); - LLPanel* prepareItemsPanel(LLPanel::Params params, S32 items_count); - - LLPanel* mItemsPanel; - std::list mHidenItems; - LLButton* mArrowBtn; - LLButton* mShownItem; - EArrowPosition mArrowPosition; - - boost::signals2::connection mTopLostSignalConnection; - - commit_callback_t mSelectionCallback; -}; - - -#endif +/** + * @file llsplitbutton.h + * @brief LLSplitButton base class + * + * $LicenseInfo:firstyear=2009&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$ + */ + +// A control that displays the name of the chosen item, which when clicked +// shows a scrolling box of choices. + + +#include "llbutton.h" +#include "llpanel.h" +#include "lluictrl.h" + + +#ifndef LL_LLSPLITBUTTON_H +#define LL_LLSPLITBUTTON_H + +class LLSplitButton + : public LLUICtrl +{ +public: + typedef enum e_arrow_position + { + LEFT, + RIGHT + } EArrowPosition; + + struct ArrowPositionValues : public LLInitParam::TypeValuesHelper + { + static void declareValues(); + }; + + struct ItemParams : public LLInitParam::Block + { + ItemParams(); + }; + + struct Params : public LLInitParam::Block + { + Optional arrow_position; + Optional arrow_button; + Optional items_panel; + Multiple items; + + Params(); + }; + + + virtual ~LLSplitButton(); + + //Overridden + virtual void onFocusLost(); + virtual void setFocus(bool b); + virtual void setEnabled(bool enabled); + + //Callbacks + void onArrowBtnDown(); + void onHeldDownShownButton(); + void onItemSelected(LLUICtrl* ctrl); + void setSelectionCallback(commit_callback_t cb) { mSelectionCallback = cb; } + + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + + virtual void showButtons(); + virtual void hideButtons(); + + +protected: + friend class LLUICtrlFactory; + LLSplitButton(const LLSplitButton::Params& p); + + LLButton* prepareItemButton(LLButton::Params params); + LLPanel* prepareItemsPanel(LLPanel::Params params, S32 items_count); + + LLPanel* mItemsPanel; + std::list mHidenItems; + LLButton* mArrowBtn; + LLButton* mShownItem; + EArrowPosition mArrowPosition; + + boost::signals2::connection mTopLostSignalConnection; + + commit_callback_t mSelectionCallback; +}; + + +#endif -- cgit v1.2.3