From 64d005bfed6c5adcd29df3ae0774747480a0d839 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 5 Oct 2011 17:04:07 -0700
Subject: [PATCH] EXP-1286 : Add DaD to toybox
---
indra/llui/lltoolbar.cpp | 11 ++++++++---
indra/llui/lltoolbar.h | 1 +
indra/newview/llfloatertoybox.cpp | 5 ++++-
indra/newview/lltoolbarview.cpp | 16 +++++++++-------
4 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 9ffb859053e..ef36f426fab 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -103,7 +103,11 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
mPadTop(p.pad_top),
mPadBottom(p.pad_bottom),
mPadBetween(p.pad_between),
- mPopupMenuHandle()
+ mPopupMenuHandle(),
+ mStartDragItemCallback(NULL),
+ mHandleDragItemCallback(NULL),
+ mHandleDropCallback(NULL),
+ mDragAndDropTarget(false)
{
mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_WITH_TEXT] = p.button_icon_and_text;
mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_ONLY] = p.button_icon;
@@ -608,9 +612,10 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id)
cbParam.function_name = commandp->executeFunctionName();
cbParam.parameter = commandp->executeParameters();
button->setCommitCallback(cbParam);
- button->setStartDragCallback(mStartDragItemCallback);
- button->setHandleDragCallback(mHandleDragItemCallback);
}
+ // Drag and drop behavior must work also if provided in the Toybox and, potentially, any read-only toolbar
+ button->setStartDragCallback(mStartDragItemCallback);
+ button->setHandleDragCallback(mHandleDragItemCallback);
button->setCommandId(id);
return button;
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index a35f6d9db19..b630b82d0f5 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -159,6 +159,7 @@ class LLToolBar
void setStartDragCallback(tool_startdrag_callback_t cb) { mStartDragItemCallback = cb; }
void setHandleDragCallback(tool_handledrag_callback_t cb) { mHandleDragItemCallback = cb; }
void setHandleDropCallback(tool_handledrop_callback_t cb) { mHandleDropCallback = cb; }
+ bool isReadOnly() const { return mReadOnly; }
LLToolBarButton* createButton(const LLCommandId& id);
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp
index cf22e071aaf..58bb417b71f 100644
--- a/indra/newview/llfloatertoybox.cpp
+++ b/indra/newview/llfloatertoybox.cpp
@@ -62,7 +62,10 @@ BOOL LLFloaterToybox::postBuild()
mBtnRestoreDefaults = getChild<LLButton>("btn_restore_defaults");
mToolBar = getChild<LLToolBar>("toybox_toolbar");
-
+ mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragItem,_1,_2,_3));
+ mToolBar->setHandleDragCallback(boost::bind(LLToolBarView::handleDragItem,_1,_2,_3,_4));
+ mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDrop,_1,_2,_3,_4));
+
LLCommandManager& cmdMgr = LLCommandManager::instance();
//
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 5f3e3860355..c0408e4850d 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -377,24 +377,26 @@ BOOL LLToolBarView::handleDrop( void* cargo_data, S32 x, S32 y, LLToolBar* toolb
if (command)
{
// Convert the (x,y) position in rank in toolbar
- int rank = toolbar->getRankFromPosition(x,y);
+ int rank = 0;
+ if (!toolbar->isReadOnly())
+ {
+ rank = toolbar->getRankFromPosition(x,y);
+ }
// Suppress the command from the toolbars (including the one it's dropped in,
// this will handle move position).
gToolBarView->mToolbarLeft->removeCommand(command->id());
gToolBarView->mToolbarRight->removeCommand(command->id());
gToolBarView->mToolbarBottom->removeCommand(command->id());
// Now insert it in the toolbar at the detected rank
- toolbar->addCommand(command->id(),rank);
+ if (!toolbar->isReadOnly())
+ {
+ toolbar->addCommand(command->id(),rank);
+ }
}
else
{
llwarns << "Command couldn't be found in command manager" << llendl;
}
-
- }
- else
- {
- llinfos << "Merov debug : handleDrop. Drop source is not a widget -> nothing to do" << llendl;
}
return TRUE;
--
GitLab