matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix context menu position #65

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-03 17:44:12 +01:00
parent c7dd248ae3
commit 40e5ce5d37
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/interface/Component.cpp
View File

@ -156,6 +156,17 @@ void Component::SetParent(Panel* new_parent)
this->_parent = new_parent; this->_parent = new_parent;
} }
Point Component::GetScreenPos()
{
Point newPos(0,0);
if(GetParentWindow())
newPos += GetParentWindow()->Position;
if(GetParent())
newPos += GetParent()->Position;
newPos += Position;
return newPos;
}
// ***** OVERRIDEABLES ***** // ***** OVERRIDEABLES *****
// Kept empty. // Kept empty.

2
src/interface/Component.h
View File

@ -50,6 +50,8 @@ namespace ui
virtual void TextPosition(std::string); virtual void TextPosition(std::string);
void Refresh(); void Refresh();
Point GetScreenPos();
/* See the parent of this component. /* See the parent of this component.
* If new_parent is NULL, this component will have no parent. (THIS DOES NOT delete THE COMPONENT. See XComponent::RemoveChild) * If new_parent is NULL, this component will have no parent. (THIS DOES NOT delete THE COMPONENT. See XComponent::RemoveChild)

2
src/interface/Label.cpp
View File

@ -121,7 +121,7 @@ void Label::OnMouseClick(int x, int y, unsigned button)
if(button == BUTTON_RIGHT) if(button == BUTTON_RIGHT)
{ {
if(menu) if(menu)
menu->Show(GetParentWindow()->Position + Position + ui::Point(x, y)); menu->Show(GetScreenPos() + ui::Point(x, y));
} }
else else
{ {