rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Widgets inheriting from Container should not have to bother with calling getChildWidgetsOffset themselves

0.8
Bruno Van de Velde 2017-02-21 02:14:12 +01:00
parent 7b4cc9a727
commit bba1517fff
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/TGUI/Container.cpp
View File

@ -488,8 +488,8 @@ namespace tgui
sf::Event event;
event.type = sf::Event::MouseButtonPressed;
event.mouseButton.button = sf::Mouse::Left;
event.mouseButton.x = static_cast<int>(pos.x);
event.mouseButton.y = static_cast<int>(pos.y);
event.mouseButton.x = static_cast<int>(pos.x - getChildWidgetsOffset().x);
event.mouseButton.y = static_cast<int>(pos.y - getChildWidgetsOffset().y);
// Let the event manager handle the event
handleEvent(event);
@ -502,8 +502,8 @@ namespace tgui
sf::Event event;
event.type = sf::Event::MouseButtonReleased;
event.mouseButton.button = sf::Mouse::Left;
event.mouseButton.x = static_cast<int>(pos.x);
event.mouseButton.y = static_cast<int>(pos.y);
event.mouseButton.x = static_cast<int>(pos.x - getChildWidgetsOffset().x);
event.mouseButton.y = static_cast<int>(pos.y - getChildWidgetsOffset().y);
// Let the event manager handle the event, but don't let it call mouseNoLongerDown on all widgets (it will be done later)
m_handingMouseReleased = true;
@ -519,8 +519,8 @@ namespace tgui
sf::Event event;
event.type = sf::Event::MouseMoved;
event.mouseMove.x = static_cast<int>(pos.x);
event.mouseMove.y = static_cast<int>(pos.y);
event.mouseMove.x = static_cast<int>(pos.x - getChildWidgetsOffset().x);
event.mouseMove.y = static_cast<int>(pos.y - getChildWidgetsOffset().y);
handleEvent(event);
}
@ -555,8 +555,8 @@ namespace tgui
sf::Event event;
event.type = sf::Event::MouseWheelScrolled;
event.mouseWheelScroll.delta = delta;
event.mouseWheelScroll.x = static_cast<int>(x);
event.mouseWheelScroll.y = static_cast<int>(y);
event.mouseWheelScroll.x = static_cast<int>(x - getChildWidgetsOffset().x);
event.mouseWheelScroll.y = static_cast<int>(y - getChildWidgetsOffset().y);
// Let the event manager handle the event
handleEvent(event);
@ -967,7 +967,7 @@ namespace tgui
Widget::Ptr Container::mouseOnWhichWidget(sf::Vector2f mousePos)
{
Widget::Ptr widget = nullptr;
for (std::vector<Widget::Ptr>::reverse_iterator it = m_widgets.rbegin(); it != m_widgets.rend(); ++it)
for (auto it = m_widgets.rbegin(); it != m_widgets.rend(); ++it)
{
if ((*it)->isVisible())
{

9
src/TGUI/Widgets/ChildWindow.cpp
View File

@ -416,7 +416,7 @@ namespace tgui
}
}
else // Propagate the event to the child widgets
Container::leftMousePressed({pos.x - m_bordersCached.left, pos.y - (m_titleBarHeightCached + m_bordersCached.top)});
Container::leftMousePressed(pos);
}
}
@ -451,7 +451,7 @@ namespace tgui
widget->mouseNoLongerDown();
}
else // Propagate the event to the child widgets
Container::leftMouseReleased({pos.x - m_bordersCached.left, pos.y - (m_titleBarHeightCached + m_bordersCached.top)});
Container::leftMouseReleased(pos);
}
}
@ -539,15 +539,14 @@ namespace tgui
}
}
Container::mouseMoved({pos.x - m_bordersCached.left, pos.y - m_titleBarHeightCached - m_bordersCached.top});
Container::mouseMoved(pos);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void ChildWindow::mouseWheelMoved(float delta, int x, int y)
{
sf::Vector2f offset = getChildWidgetsOffset();
Container::mouseWheelMoved(delta, static_cast<int>(x - offset.x), static_cast<int>(y - offset.y));
Container::mouseWheelMoved(delta, x, y);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////