Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxRibbonToolbar Coord Functions

Browse Source
This commit is contained in:
Gary Allen
2021-01-10 18:34:58 +02:00
parent 4ed8ccff95
commit 0ee16339ae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ribbon/toolbar.cpp
View File

@@ -439,7 +439,7 @@ wxRibbonToolBarToolBase* wxRibbonToolBar::GetToolByPos(wxCoord x, wxCoord y)cons
for ( size_t t = 0; t < tool_count; ++t ) for ( size_t t = 0; t < tool_count; ++t )
{ {
wxRibbonToolBarToolBase* tool = group->tools.Item(t); wxRibbonToolBarToolBase* tool = group->tools.Item(t);
wxRect rect(tool->position, tool->size); wxRect rect(tool->position + group->position, tool->size);
if(rect.Contains(x, y)) if(rect.Contains(x, y))
{ {
return tool; return tool;
@@ -535,7 +535,7 @@ wxRect wxRibbonToolBar::GetToolRect(int tool_id)const
wxRibbonToolBarToolBase* tool = group->tools.Item(t); wxRibbonToolBarToolBase* tool = group->tools.Item(t);
if (tool->id == tool_id) if (tool->id == tool_id)
{ {
wxRect rect(tool->position.x, tool->position.y, tool->size.GetWidth(), tool->size.GetHeight()); wxRect rect(tool->position + group->position, tool->size);
return rect; return rect;
} }
++pos; ++pos;