mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-13 19:39:44 +00:00
Code Issues Releases Wiki Activity

items can now also be dropped on another item (and will be placed in

Browse source 
container)
This commit is contained in:
scrawl 2012-05-12 20:06:44 +02:00
parent 54c23c7422
commit f3c88adc0b
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/container.cpp
View file

@ -63,6 +63,8 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
_sender->getChildAt(0)->getChildAt(0)->setVisible(false); _sender->getChildAt(0)->getChildAt(0)->setVisible(false);
drawItems(); drawItems();
} }
else
onContainerClicked(mContainerWidget);
} }
void ContainerBase::onContainerClicked(MyGUI::Widget* _sender) void ContainerBase::onContainerClicked(MyGUI::Widget* _sender)

3
apps/openmw/mwgui/tooltips.cpp
View file

@ -29,8 +29,6 @@ ToolTips::ToolTips(WindowManager* windowManager) :
void ToolTips::onFrame(float frameDuration) 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); MyGUI::Gui::getInstance().destroyWidget(mDynamicToolTipBox);
mDynamicToolTipBox = mMainWidget->createWidget<Widget>("HUD_Box", mDynamicToolTipBox = mMainWidget->createWidget<Widget>("HUD_Box",
IntCoord(0, 0, mMainWidget->getCoord().width, mMainWidget->getCoord().height), 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 // 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) /// \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), setCoord(std::max(0, viewSize.width/2 - (tooltipSize.width)/2),
std::max(0, viewSize.height/2 - (tooltipSize.height) - 32), std::max(0, viewSize.height/2 - (tooltipSize.height) - 32),
tooltipSize.width, tooltipSize.width,