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/llnetmap.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 75c1abc4ed..c574a32dab 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -70,17 +70,17 @@ public: static const F32 MAP_SCALE_MAX; /*virtual*/ void draw(); - /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask ); - /*virtual*/ BOOL handleToolTip( S32 x, S32 y, MASK mask); + /*virtual*/ bool handleScrollWheel(S32 x, S32 y, S32 clicks); + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleHover( S32 x, S32 y, MASK mask ); + /*virtual*/ bool handleToolTip( S32 x, S32 y, MASK mask); /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ BOOL postBuild(); - /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); + /*virtual*/ bool handleRightMouseDown( S32 x, S32 y, MASK mask ); /*virtual*/ BOOL handleClick(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask ); + /*virtual*/ bool handleDoubleClick( S32 x, S32 y, MASK mask ); void setScale(F32 scale); -- 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/llnetmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index c574a32dab..0b35f2d6bf 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -75,11 +75,11 @@ public: /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ bool handleHover( S32 x, S32 y, MASK mask ); /*virtual*/ bool handleToolTip( S32 x, S32 y, MASK mask); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); - /*virtual*/ BOOL postBuild(); + /*virtual*/ bool postBuild(); /*virtual*/ bool handleRightMouseDown( S32 x, S32 y, MASK mask ); - /*virtual*/ BOOL handleClick(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleClick(S32 x, S32 y, MASK mask); /*virtual*/ bool handleDoubleClick( S32 x, S32 y, MASK mask ); void setScale(F32 scale); -- cgit v1.2.3 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/llnetmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 0b35f2d6bf..146f4e9546 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -105,10 +105,10 @@ private: void drawTracking( const LLVector3d& pos_global, const LLColor4& color, - BOOL draw_arrow = TRUE); + bool draw_arrow = true); bool isMouseOnPopupMenu(); void updateAboutLandPopupButton(); - BOOL handleToolTipAgent(const LLUUID& avatar_id); + bool handleToolTipAgent(const LLUUID& avatar_id); static void showAvatarInspector(const LLUUID& avatar_id); void createObjectImage(); -- 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/llnetmap.h | 340 +++++++++++++++++++++++------------------------ 1 file changed, 170 insertions(+), 170 deletions(-) (limited to 'indra/newview/llnetmap.h') diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h index 437390baa4..7bb13c9f2b 100644 --- a/indra/newview/llnetmap.h +++ b/indra/newview/llnetmap.h @@ -1,170 +1,170 @@ -/** - * @file llnetmap.h - * @brief A little map of the world with network information - * - * $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$ - */ - -#ifndef LL_LLNETMAP_H -#define LL_LLNETMAP_H - -#include "llmath.h" -#include "lluictrl.h" -#include "v3math.h" -#include "v3dmath.h" -#include "v4color.h" -#include "llpointer.h" -#include "llcoord.h" - -class LLColor4U; -class LLImageRaw; -class LLViewerTexture; -class LLFloaterMap; -class LLMenuGL; - -class LLNetMap : public LLUICtrl -{ -public: - struct Params - : public LLInitParam::Block - { - Optional bg_color; - - Params() - : bg_color("bg_color") - {} - }; - -protected: - LLNetMap (const Params & p); - friend class LLUICtrlFactory; - friend class LLFloaterMap; - -public: - virtual ~LLNetMap(); - - static const F32 MAP_SCALE_MIN; - static const F32 MAP_SCALE_FAR; - static const F32 MAP_SCALE_MEDIUM; - static const F32 MAP_SCALE_CLOSE; - static const F32 MAP_SCALE_VERY_CLOSE; - static const F32 MAP_SCALE_MAX; - - /*virtual*/ void draw(); - /*virtual*/ bool handleScrollWheel(S32 x, S32 y, S32 clicks); - /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleHover( S32 x, S32 y, MASK mask ); - /*virtual*/ bool handleToolTip( S32 x, S32 y, MASK mask); - /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); - - /*virtual*/ bool postBuild(); - /*virtual*/ bool handleRightMouseDown( S32 x, S32 y, MASK mask ); - /*virtual*/ bool handleClick(S32 x, S32 y, MASK mask); - /*virtual*/ bool handleDoubleClick( S32 x, S32 y, MASK mask ); - - void setScale(F32 scale); - - void setToolTipMsg(const std::string& msg) { mToolTipMsg = msg; } - void setParcelNameMsg(const std::string& msg) { mParcelNameMsg = msg; } - void setParcelSalePriceMsg(const std::string& msg) { mParcelSalePriceMsg = msg; } - void setParcelSaleAreaMsg(const std::string& msg) { mParcelSaleAreaMsg = msg; } - void setParcelOwnerMsg(const std::string& msg) { mParcelOwnerMsg = msg; } - void setRegionNameMsg(const std::string& msg) { mRegionNameMsg = msg; } - void setToolTipHintMsg(const std::string& msg) { mToolTipHintMsg = msg; } - void setAltToolTipHintMsg(const std::string& msg) { mAltToolTipHintMsg = msg; } - - void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius ); - -private: - const LLVector3d& getObjectImageCenterGlobal() { return mObjectImageCenterGlobal; } - void renderPoint(const LLVector3 &pos, const LLColor4U &color, - S32 diameter, S32 relative_height = 0); - - LLVector3 globalPosToView(const LLVector3d& global_pos); - LLVector3d viewPosToGlobal(S32 x,S32 y); - - void drawTracking( const LLVector3d& pos_global, - const LLColor4& color, - bool draw_arrow = true); - bool isMouseOnPopupMenu(); - void updateAboutLandPopupButton(); - bool handleToolTipAgent(const LLUUID& avatar_id); - static void showAvatarInspector(const LLUUID& avatar_id); - - void createObjectImage(); - - F32 getScaleForName(std::string scale_name); - static bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y, S32 slop); - -private: - bool mUpdateNow; - - LLUIColor mBackgroundColor; - - F32 mScale; // Size of a region in pixels - F32 mPixelsPerMeter; // world meters to map pixels - F32 mObjectMapTPM; // texels per meter on map - F32 mObjectMapPixels; // Width of object map in pixels - F32 mDotRadius; // Size of avatar markers - - bool mPanning; // map is being dragged - bool mCentering; // map is being re-centered around the agent - LLVector2 mCurPan; - LLVector2 mStartPan; // pan offset at start of drag - LLVector3d mPopupWorldPos; // world position picked under mouse when context menu is opened - LLCoordGL mMouseDown; // pointer position at start of drag - - LLVector3d mObjectImageCenterGlobal; - LLPointer mObjectRawImagep; - LLPointer mObjectImagep; - - LLUUID mClosestAgentToCursor; - LLUUID mClosestAgentAtLastRightClick; - - std::string mToolTipMsg; - std::string mParcelNameMsg; - std::string mParcelSalePriceMsg; - std::string mParcelSaleAreaMsg; - std::string mParcelOwnerMsg; - std::string mRegionNameMsg; - std::string mToolTipHintMsg; - std::string mAltToolTipHintMsg; - -public: - void setSelected(uuid_vec_t uuids) { gmSelected=uuids; }; - -private: - bool isZoomChecked(const LLSD& userdata); - void setZoom(const LLSD& userdata); - void handleStopTracking(const LLSD& userdata); - void activateCenterMap(const LLSD& userdata); - bool isMapOrientationChecked(const LLSD& userdata); - void setMapOrientation(const LLSD& userdata); - void popupShowAboutLand(const LLSD& userdata); - - LLHandle mPopupMenuHandle; - uuid_vec_t gmSelected; -}; - - -#endif +/** + * @file llnetmap.h + * @brief A little map of the world with network information + * + * $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$ + */ + +#ifndef LL_LLNETMAP_H +#define LL_LLNETMAP_H + +#include "llmath.h" +#include "lluictrl.h" +#include "v3math.h" +#include "v3dmath.h" +#include "v4color.h" +#include "llpointer.h" +#include "llcoord.h" + +class LLColor4U; +class LLImageRaw; +class LLViewerTexture; +class LLFloaterMap; +class LLMenuGL; + +class LLNetMap : public LLUICtrl +{ +public: + struct Params + : public LLInitParam::Block + { + Optional bg_color; + + Params() + : bg_color("bg_color") + {} + }; + +protected: + LLNetMap (const Params & p); + friend class LLUICtrlFactory; + friend class LLFloaterMap; + +public: + virtual ~LLNetMap(); + + static const F32 MAP_SCALE_MIN; + static const F32 MAP_SCALE_FAR; + static const F32 MAP_SCALE_MEDIUM; + static const F32 MAP_SCALE_CLOSE; + static const F32 MAP_SCALE_VERY_CLOSE; + static const F32 MAP_SCALE_MAX; + + /*virtual*/ void draw(); + /*virtual*/ bool handleScrollWheel(S32 x, S32 y, S32 clicks); + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleHover( S32 x, S32 y, MASK mask ); + /*virtual*/ bool handleToolTip( S32 x, S32 y, MASK mask); + /*virtual*/ void reshape(S32 width, S32 height, bool called_from_parent = true); + + /*virtual*/ bool postBuild(); + /*virtual*/ bool handleRightMouseDown( S32 x, S32 y, MASK mask ); + /*virtual*/ bool handleClick(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleDoubleClick( S32 x, S32 y, MASK mask ); + + void setScale(F32 scale); + + void setToolTipMsg(const std::string& msg) { mToolTipMsg = msg; } + void setParcelNameMsg(const std::string& msg) { mParcelNameMsg = msg; } + void setParcelSalePriceMsg(const std::string& msg) { mParcelSalePriceMsg = msg; } + void setParcelSaleAreaMsg(const std::string& msg) { mParcelSaleAreaMsg = msg; } + void setParcelOwnerMsg(const std::string& msg) { mParcelOwnerMsg = msg; } + void setRegionNameMsg(const std::string& msg) { mRegionNameMsg = msg; } + void setToolTipHintMsg(const std::string& msg) { mToolTipHintMsg = msg; } + void setAltToolTipHintMsg(const std::string& msg) { mAltToolTipHintMsg = msg; } + + void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius ); + +private: + const LLVector3d& getObjectImageCenterGlobal() { return mObjectImageCenterGlobal; } + void renderPoint(const LLVector3 &pos, const LLColor4U &color, + S32 diameter, S32 relative_height = 0); + + LLVector3 globalPosToView(const LLVector3d& global_pos); + LLVector3d viewPosToGlobal(S32 x,S32 y); + + void drawTracking( const LLVector3d& pos_global, + const LLColor4& color, + bool draw_arrow = true); + bool isMouseOnPopupMenu(); + void updateAboutLandPopupButton(); + bool handleToolTipAgent(const LLUUID& avatar_id); + static void showAvatarInspector(const LLUUID& avatar_id); + + void createObjectImage(); + + F32 getScaleForName(std::string scale_name); + static bool outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y, S32 slop); + +private: + bool mUpdateNow; + + LLUIColor mBackgroundColor; + + F32 mScale; // Size of a region in pixels + F32 mPixelsPerMeter; // world meters to map pixels + F32 mObjectMapTPM; // texels per meter on map + F32 mObjectMapPixels; // Width of object map in pixels + F32 mDotRadius; // Size of avatar markers + + bool mPanning; // map is being dragged + bool mCentering; // map is being re-centered around the agent + LLVector2 mCurPan; + LLVector2 mStartPan; // pan offset at start of drag + LLVector3d mPopupWorldPos; // world position picked under mouse when context menu is opened + LLCoordGL mMouseDown; // pointer position at start of drag + + LLVector3d mObjectImageCenterGlobal; + LLPointer mObjectRawImagep; + LLPointer mObjectImagep; + + LLUUID mClosestAgentToCursor; + LLUUID mClosestAgentAtLastRightClick; + + std::string mToolTipMsg; + std::string mParcelNameMsg; + std::string mParcelSalePriceMsg; + std::string mParcelSaleAreaMsg; + std::string mParcelOwnerMsg; + std::string mRegionNameMsg; + std::string mToolTipHintMsg; + std::string mAltToolTipHintMsg; + +public: + void setSelected(uuid_vec_t uuids) { gmSelected=uuids; }; + +private: + bool isZoomChecked(const LLSD& userdata); + void setZoom(const LLSD& userdata); + void handleStopTracking(const LLSD& userdata); + void activateCenterMap(const LLSD& userdata); + bool isMapOrientationChecked(const LLSD& userdata); + void setMapOrientation(const LLSD& userdata); + void popupShowAboutLand(const LLSD& userdata); + + LLHandle mPopupMenuHandle; + uuid_vec_t gmSelected; +}; + + +#endif -- cgit v1.2.3