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/llscrolllistcolumn.h | 230 ++++++++++++++++++++-------------------- 1 file changed, 115 insertions(+), 115 deletions(-) (limited to 'indra/llui/llscrolllistcolumn.h') diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h index b4d4a6d05e..d535d96c76 100644 --- a/indra/llui/llscrolllistcolumn.h +++ b/indra/llui/llscrolllistcolumn.h @@ -1,26 +1,26 @@ -/** +/** * @file llscrollcolumnheader.h - * @brief Scroll lists are composed of rows (items), each of which + * @brief Scroll lists are composed of rows (items), each of which * contains columns (cells). * * $LicenseInfo:firstyear=2007&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$ */ @@ -40,33 +40,33 @@ class LLScrollListCtrl; class LLScrollColumnHeader : public LLButton { public: - struct Params : public LLInitParam::Block - { - Mandatory column; + struct Params : public LLInitParam::Block + { + Mandatory column; + + Params(); + }; + LLScrollColumnHeader(const Params&); + ~LLScrollColumnHeader(); - Params(); - }; - LLScrollColumnHeader(const Params&); - ~LLScrollColumnHeader(); + /*virtual*/ void draw(); + /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - /*virtual*/ void draw(); - /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + /*virtual*/ LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding); + /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false); - /*virtual*/ LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding); - /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false); - - LLScrollListColumn* getColumn() { return mColumn; } - void setHasResizableElement(BOOL resizable); - void updateResizeBars(); - BOOL canResize(); - void enableResizeBar(BOOL enable); + LLScrollListColumn* getColumn() { return mColumn; } + void setHasResizableElement(BOOL resizable); + void updateResizeBars(); + BOOL canResize(); + void enableResizeBar(BOOL enable); - void onClick(const LLSD& data); + void onClick(const LLSD& data); private: - LLScrollListColumn* mColumn; - LLResizeBar* mResizeBar; - BOOL mHasResizableElement; + LLScrollListColumn* mColumn; + LLResizeBar* mResizeBar; + BOOL mHasResizableElement; }; /* @@ -75,98 +75,98 @@ private: class LLScrollListColumn { public: - typedef enum e_sort_direction - { - DESCENDING, - ASCENDING - } ESortDirection; - - struct SortNames - : public LLInitParam::TypeValuesHelper - { - static void declareValues(); - }; - - struct Params : public LLInitParam::Block - { - Optional name, - tool_tip; - Optional sort_column; - Optional sort_direction; - Optional sort_ascending; - - struct Width : public LLInitParam::ChoiceBlock - { - Alternative dynamic_width; - Alternative pixel_width; - Alternative relative_width; - - Width() - : dynamic_width("dynamic_width", false), - pixel_width("width"), - relative_width("relative_width", -1.f) - { - addSynonym(relative_width, "relwidth"); - } - }; - Optional width; - - // either an image or label is used in column header - struct Header : public LLInitParam::ChoiceBlock
- { - Alternative label; - Alternative image; - - Header() - : label("label"), - image("image") - {} - }; - Optional
header; - - Optional halign; - - Params() - : name("name"), - tool_tip("tool_tip"), - sort_column("sort_column"), - sort_direction("sort_direction"), - sort_ascending("sort_ascending", true), - halign("halign", LLFontGL::LEFT) - { - // default choice to "dynamic_width" - changeDefault(width.dynamic_width, true); - - addSynonym(sort_column, "sort"); - } - }; - - static const Params& getDefaultParams(); - - //NOTE: this is default constructible so we can store it in a map. - LLScrollListColumn(const Params& p = getDefaultParams(), LLScrollListCtrl* = NULL); - - void setWidth(S32 width); - S32 getWidth() const { return mWidth; } + typedef enum e_sort_direction + { + DESCENDING, + ASCENDING + } ESortDirection; + + struct SortNames + : public LLInitParam::TypeValuesHelper + { + static void declareValues(); + }; + + struct Params : public LLInitParam::Block + { + Optional name, + tool_tip; + Optional sort_column; + Optional sort_direction; + Optional sort_ascending; + + struct Width : public LLInitParam::ChoiceBlock + { + Alternative dynamic_width; + Alternative pixel_width; + Alternative relative_width; + + Width() + : dynamic_width("dynamic_width", false), + pixel_width("width"), + relative_width("relative_width", -1.f) + { + addSynonym(relative_width, "relwidth"); + } + }; + Optional width; + + // either an image or label is used in column header + struct Header : public LLInitParam::ChoiceBlock
+ { + Alternative label; + Alternative image; + + Header() + : label("label"), + image("image") + {} + }; + Optional
header; + + Optional halign; + + Params() + : name("name"), + tool_tip("tool_tip"), + sort_column("sort_column"), + sort_direction("sort_direction"), + sort_ascending("sort_ascending", true), + halign("halign", LLFontGL::LEFT) + { + // default choice to "dynamic_width" + changeDefault(width.dynamic_width, true); + + addSynonym(sort_column, "sort"); + } + }; + + static const Params& getDefaultParams(); + + //NOTE: this is default constructible so we can store it in a map. + LLScrollListColumn(const Params& p = getDefaultParams(), LLScrollListCtrl* = NULL); + + void setWidth(S32 width); + S32 getWidth() const { return mWidth; } public: - // Public data is fine so long as this remains a simple struct-like data class. - // If it ever gets any smarter than that, these should all become private - // with protected or public accessor methods added as needed. -MG - std::string mName; - std::string mSortingColumn; - ESortDirection mSortDirection; - LLUIString mLabel; - F32 mRelWidth; - BOOL mDynamicWidth; - S32 mMaxContentWidth; - S32 mIndex; - LLScrollListCtrl* mParentCtrl; - LLScrollColumnHeader* mHeader; - LLFontGL::HAlign mFontAlignment; + // Public data is fine so long as this remains a simple struct-like data class. + // If it ever gets any smarter than that, these should all become private + // with protected or public accessor methods added as needed. -MG + std::string mName; + std::string mSortingColumn; + ESortDirection mSortDirection; + LLUIString mLabel; + F32 mRelWidth; + BOOL mDynamicWidth; + S32 mMaxContentWidth; + S32 mIndex; + LLScrollListCtrl* mParentCtrl; + LLScrollColumnHeader* mHeader; + LLFontGL::HAlign mFontAlignment; private: - S32 mWidth; + S32 mWidth; }; #endif -- cgit v1.2.3