From f3c88adc0b6f8ff8cb86d49ec6d5ee50cdcd365c Mon Sep 17 00:00:00 2001 From: scrawl Date: Sat, 12 May 2012 20:06:44 +0200 Subject: [PATCH] items can now also be dropped on another item (and will be placed in container) --- apps/openmw/mwgui/container.cpp | 2 ++ apps/openmw/mwgui/tooltips.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index e2be9147c..448ae6482 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -63,6 +63,8 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender) _sender->getChildAt(0)->getChildAt(0)->setVisible(false); drawItems(); } + else + onContainerClicked(mContainerWidget); } void ContainerBase::onContainerClicked(MyGUI::Widget* _sender) diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index aa189b2e8..67479e3f9 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/apps/openmw/mwgui/tooltips.cpp @@ -29,8 +29,6 @@ ToolTips::ToolTips(WindowManager* windowManager) : void ToolTips::onFrame(float frameDuration) { - /// \todo Store a MWWorld::Ptr in the widget user data, retrieve it here and construct a tooltip dynamically - MyGUI::Gui::getInstance().destroyWidget(mDynamicToolTipBox); mDynamicToolTipBox = mMainWidget->createWidget("HUD_Box", IntCoord(0, 0, mMainWidget->getCoord().width, mMainWidget->getCoord().height), @@ -110,6 +108,7 @@ void ToolTips::onFrame(float frameDuration) // adjust tooltip size to fit its content, position it above the crosshair /// \todo Slide the tooltip along the bounding box of the focused object (like in Morrowind) + /// relevant link: http://www.ogre3d.org/tikiwiki/ObjectTextDisplay setCoord(std::max(0, viewSize.width/2 - (tooltipSize.width)/2), std::max(0, viewSize.height/2 - (tooltipSize.height) - 32), tooltipSize.width,