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/llui/lliconctrl.h | 82 ++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'indra/llui/lliconctrl.h') diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index e983d63a01..240fe3a74c 100644 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -1,25 +1,25 @@ -/** +/** * @file lliconctrl.h * @brief LLIconCtrl base class * * $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$ */ @@ -46,62 +46,62 @@ class LLIconCtrl : public LLUICtrl { public: - struct Params : public LLInitParam::Block - { - Optional image; - Optional color; - Optional use_draw_context_alpha, + struct Params : public LLInitParam::Block + { + Optional image; + Optional color; + Optional use_draw_context_alpha, interactable; - Optional min_width, - min_height; - Ignored scale_image; + Optional min_width, + min_height; + Ignored scale_image; - Params(); - }; + Params(); + }; protected: - LLIconCtrl(const Params&); - friend class LLUICtrlFactory; + LLIconCtrl(const Params&); + friend class LLUICtrlFactory; - void setValue(const LLSD& value, S32 priority); + void setValue(const LLSD& value, S32 priority); public: - virtual ~LLIconCtrl(); + virtual ~LLIconCtrl(); - // llview overrides - virtual void draw(); + // llview overrides + virtual void draw(); // llview overrides virtual BOOL handleHover(S32 x, S32 y, MASK mask); - // lluictrl overrides - void onVisibilityChange(BOOL new_visibility); - virtual void setValue(const LLSD& value ); + // lluictrl overrides + void onVisibilityChange(BOOL new_visibility); + virtual void setValue(const LLSD& value ); + + std::string getImageName() const; - std::string getImageName() const; + void setColor(const LLColor4& color) { mColor = color; } + void setImage(LLPointer image) { mImagep = image; } + const LLPointer getImage() { return mImagep; } - void setColor(const LLColor4& color) { mColor = color; } - void setImage(LLPointer image) { mImagep = image; } - const LLPointer getImage() { return mImagep; } - protected: - S32 mPriority; + S32 mPriority; - //the output size of the icon image if set. - S32 mMinWidth, - mMinHeight, - mMaxWidth, - mMaxHeight; + //the output size of the icon image if set. + S32 mMinWidth, + mMinHeight, + mMaxWidth, + mMaxHeight; - // If set to true (default), use the draw context transparency. - // If false, will use transparency returned by getCurrentTransparency(). See STORM-698. - bool mUseDrawContextAlpha; + // If set to true (default), use the draw context transparency. + // If false, will use transparency returned by getCurrentTransparency(). See STORM-698. + bool mUseDrawContextAlpha; bool mInteractable; private: - void loadImage(const LLSD& value, S32 priority); + void loadImage(const LLSD& value, S32 priority); - LLUIColor mColor; - LLPointer mImagep; + LLUIColor mColor; + LLPointer mImagep; }; #endif -- cgit v1.2.3