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/lltransientfloatermgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lltransientfloatermgr.cpp') diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp index 3d68c10489..129c7e1b6d 100644 --- a/indra/newview/lltransientfloatermgr.cpp +++ b/indra/newview/lltransientfloatermgr.cpp @@ -96,7 +96,7 @@ void LLTransientFloaterMgr::hideTransientFloaters(S32 x, S32 y) bool hide = isControlClicked(group, mGroupControls.find(group)->second, x, y); if (hide) { - floater->setTransientVisible(FALSE); + floater->setTransientVisible(false); } } } -- 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/lltransientfloatermgr.cpp | 338 ++++++++++++++++---------------- 1 file changed, 169 insertions(+), 169 deletions(-) (limited to 'indra/newview/lltransientfloatermgr.cpp') diff --git a/indra/newview/lltransientfloatermgr.cpp b/indra/newview/lltransientfloatermgr.cpp index 52a049764c..dc777dbb67 100644 --- a/indra/newview/lltransientfloatermgr.cpp +++ b/indra/newview/lltransientfloatermgr.cpp @@ -1,169 +1,169 @@ -/** - * @file lltransientfloatermgr.cpp - * @brief LLFocusMgr base class - * - * $LicenseInfo:firstyear=2002&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$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "lltransientfloatermgr.h" -#include "llfocusmgr.h" -#include "llrootview.h" -#include "llviewerwindow.h" -#include "lldockablefloater.h" -#include "llmenugl.h" - - -LLTransientFloaterMgr::LLTransientFloaterMgr() -{ - if(gViewerWindow) - { - gViewerWindow->getRootView()->getChild("popup_holder")->setMouseDownCallback(boost::bind( - &LLTransientFloaterMgr::leftMouseClickCallback, this, _2, _3, _4)); - } - - mGroupControls.insert(std::pair(GLOBAL, controls_set_t())); - mGroupControls.insert(std::pair(DOCKED, controls_set_t())); - mGroupControls.insert(std::pair(IM, controls_set_t())); -} - -void LLTransientFloaterMgr::registerTransientFloater(LLTransientFloater* floater) -{ - mTransSet.insert(floater); -} - -void LLTransientFloaterMgr::unregisterTransientFloater(LLTransientFloater* floater) -{ - mTransSet.erase(floater); -} - -void LLTransientFloaterMgr::addControlView(ETransientGroup group, LLView* view) -{ - if (!view) return; - - mGroupControls.find(group)->second.insert(view->getHandle()); -} - -void LLTransientFloaterMgr::removeControlView(ETransientGroup group, LLView* view) -{ - if (!view) return; - - mGroupControls.find(group)->second.erase(view->getHandle()); -} - -void LLTransientFloaterMgr::addControlView(LLView* view) -{ - addControlView(GLOBAL, view); -} - -void LLTransientFloaterMgr::removeControlView(LLView* view) -{ - // we will still get focus lost callbacks on this view, but that's ok - // since we run sanity checking logic every time - removeControlView(GLOBAL, view); -} - -void LLTransientFloaterMgr::hideTransientFloaters(S32 x, S32 y) -{ - for (std::set::iterator it = mTransSet.begin(); it - != mTransSet.end(); it++) - { - LLTransientFloater* floater = *it; - if (floater->isTransientDocked()) - { - ETransientGroup group = floater->getGroup(); - - bool hide = isControlClicked(group, mGroupControls.find(group)->second, x, y); - if (hide) - { - floater->setTransientVisible(false); - } - } - } -} - -bool LLTransientFloaterMgr::isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y) -{ - std::list< LLHandle > dead_handles; - - bool res = true; - for (controls_set_t::iterator it = set.begin(); it - != set.end(); it++) - { - LLView* control_view = NULL; - - LLHandle handle = *it; - if (handle.isDead()) - { - dead_handles.push_back(handle); - continue; - } - - control_view = handle.get(); - - if (!control_view->getVisible()) - { - continue; - } - - LLRect rect = control_view->calcScreenRect(); - // if click inside view rect - if (rect.pointInRect(x, y)) - { - res = false; - break; - } - } - - for (std::list< LLHandle >::iterator it = dead_handles.begin(); it != dead_handles.end(); ++it) - { - LLHandle handle = *it; - mGroupControls.find(group)->second.erase(handle); - } - - return res; -} - -void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, - MASK mask) -{ - // don't hide transient floater if any context menu opened - if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL) - { - return; - } - - bool hide = isControlClicked(DOCKED, mGroupControls.find(DOCKED)->second, x, y) - && isControlClicked(GLOBAL, mGroupControls.find(GLOBAL)->second, x, y); - if (hide) - { - hideTransientFloaters(x, y); - } -} - -void LLTransientFloater::init(LLFloater* thiz) -{ - // used since LLTransientFloater(this) can't be used in descendant constructor parameter initialization. - mFloater = thiz; -} - +/** + * @file lltransientfloatermgr.cpp + * @brief LLFocusMgr base class + * + * $LicenseInfo:firstyear=2002&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$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "lltransientfloatermgr.h" +#include "llfocusmgr.h" +#include "llrootview.h" +#include "llviewerwindow.h" +#include "lldockablefloater.h" +#include "llmenugl.h" + + +LLTransientFloaterMgr::LLTransientFloaterMgr() +{ + if(gViewerWindow) + { + gViewerWindow->getRootView()->getChild("popup_holder")->setMouseDownCallback(boost::bind( + &LLTransientFloaterMgr::leftMouseClickCallback, this, _2, _3, _4)); + } + + mGroupControls.insert(std::pair(GLOBAL, controls_set_t())); + mGroupControls.insert(std::pair(DOCKED, controls_set_t())); + mGroupControls.insert(std::pair(IM, controls_set_t())); +} + +void LLTransientFloaterMgr::registerTransientFloater(LLTransientFloater* floater) +{ + mTransSet.insert(floater); +} + +void LLTransientFloaterMgr::unregisterTransientFloater(LLTransientFloater* floater) +{ + mTransSet.erase(floater); +} + +void LLTransientFloaterMgr::addControlView(ETransientGroup group, LLView* view) +{ + if (!view) return; + + mGroupControls.find(group)->second.insert(view->getHandle()); +} + +void LLTransientFloaterMgr::removeControlView(ETransientGroup group, LLView* view) +{ + if (!view) return; + + mGroupControls.find(group)->second.erase(view->getHandle()); +} + +void LLTransientFloaterMgr::addControlView(LLView* view) +{ + addControlView(GLOBAL, view); +} + +void LLTransientFloaterMgr::removeControlView(LLView* view) +{ + // we will still get focus lost callbacks on this view, but that's ok + // since we run sanity checking logic every time + removeControlView(GLOBAL, view); +} + +void LLTransientFloaterMgr::hideTransientFloaters(S32 x, S32 y) +{ + for (std::set::iterator it = mTransSet.begin(); it + != mTransSet.end(); it++) + { + LLTransientFloater* floater = *it; + if (floater->isTransientDocked()) + { + ETransientGroup group = floater->getGroup(); + + bool hide = isControlClicked(group, mGroupControls.find(group)->second, x, y); + if (hide) + { + floater->setTransientVisible(false); + } + } + } +} + +bool LLTransientFloaterMgr::isControlClicked(ETransientGroup group, controls_set_t& set, S32 x, S32 y) +{ + std::list< LLHandle > dead_handles; + + bool res = true; + for (controls_set_t::iterator it = set.begin(); it + != set.end(); it++) + { + LLView* control_view = NULL; + + LLHandle handle = *it; + if (handle.isDead()) + { + dead_handles.push_back(handle); + continue; + } + + control_view = handle.get(); + + if (!control_view->getVisible()) + { + continue; + } + + LLRect rect = control_view->calcScreenRect(); + // if click inside view rect + if (rect.pointInRect(x, y)) + { + res = false; + break; + } + } + + for (std::list< LLHandle >::iterator it = dead_handles.begin(); it != dead_handles.end(); ++it) + { + LLHandle handle = *it; + mGroupControls.find(group)->second.erase(handle); + } + + return res; +} + +void LLTransientFloaterMgr::leftMouseClickCallback(S32 x, S32 y, + MASK mask) +{ + // don't hide transient floater if any context menu opened + if (LLMenuGL::sMenuContainer->getVisibleMenu() != NULL) + { + return; + } + + bool hide = isControlClicked(DOCKED, mGroupControls.find(DOCKED)->second, x, y) + && isControlClicked(GLOBAL, mGroupControls.find(GLOBAL)->second, x, y); + if (hide) + { + hideTransientFloaters(x, y); + } +} + +void LLTransientFloater::init(LLFloater* thiz) +{ + // used since LLTransientFloater(this) can't be used in descendant constructor parameter initialization. + mFloater = thiz; +} + -- cgit v1.2.3