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

Merge branch 'aui-no-tooltips'

Browse Source 
Hide tooltips when style wxAUI_TB_NO_TOOLTIPS is set.

See https://github.com/wxWidgets/wxWidgets/pull/2048
This commit is contained in:
Vadim Zeitlin
2020-09-20 18:19:30 +02:00
parent 9abe63333d 466f72a16c
commit 43249151dd
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/aui/auibar.cpp
View File

@@ -2874,24 +2874,27 @@ void wxAuiToolBar::OnMotion(wxMouseEvent& evt)
SetHoverItem(hitItem);
// tooltips handling
wxAuiToolBarItem* packingHitItem;
packingHitItem = FindToolByPositionWithPacking(evt.GetX(), evt.GetY());
if (packingHitItem)
if ( !HasFlag(wxAUI_TB_NO_TOOLTIPS) )
{
if (packingHitItem != m_tipItem)
wxAuiToolBarItem* packingHitItem;
packingHitItem = FindToolByPositionWithPacking(evt.GetX(), evt.GetY());
if ( packingHitItem )
{
m_tipItem = packingHitItem;
if (packingHitItem != m_tipItem)
{
m_tipItem = packingHitItem;
if ( !packingHitItem->m_shortHelp.empty() )
SetToolTip(packingHitItem->m_shortHelp);
else
UnsetToolTip();
if ( !packingHitItem->m_shortHelp.empty() )
SetToolTip(packingHitItem->m_shortHelp);
else
UnsetToolTip();
}
}
else
{
UnsetToolTip();
m_tipItem = NULL;
}
}
else
{
UnsetToolTip();
m_tipItem = NULL;
}
// figure out the dropdown button state (are we hovering or pressing it?)