Display help string for ribbon tools in a tool tip.
Show the help string of the ribbon item currently being hovered over in a tooltip. Closes #11879. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6dd0883d55
commit
349f41fdbd
@ -459,6 +459,7 @@ All (GUI):
|
|||||||
wxDataViewCtrl (Andrew Xu).
|
wxDataViewCtrl (Andrew Xu).
|
||||||
- Fix item alignment in icon view in the generic wxListCtrl.
|
- Fix item alignment in icon view in the generic wxListCtrl.
|
||||||
- Support font-family/style, text-decoration in wxHtmlWindow (Blake Oleander).
|
- Support font-family/style, text-decoration in wxHtmlWindow (Blake Oleander).
|
||||||
|
- Show ribbon tools help strings in tooltips (John Roberts).
|
||||||
|
|
||||||
GTK:
|
GTK:
|
||||||
|
|
||||||
|
@ -875,6 +875,11 @@ void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(new_hovered == NULL && GetToolTip())
|
||||||
|
{
|
||||||
|
UnsetToolTip();
|
||||||
|
}
|
||||||
|
|
||||||
if(new_hovered != m_hovered_button || (m_hovered_button != NULL &&
|
if(new_hovered != m_hovered_button || (m_hovered_button != NULL &&
|
||||||
new_hovered_state != m_hovered_button->base->state))
|
new_hovered_state != m_hovered_button->base->state))
|
||||||
{
|
{
|
||||||
@ -886,6 +891,7 @@ void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
|
|||||||
if(m_hovered_button != NULL)
|
if(m_hovered_button != NULL)
|
||||||
{
|
{
|
||||||
m_hovered_button->base->state = new_hovered_state;
|
m_hovered_button->base->state = new_hovered_state;
|
||||||
|
SetToolTip(m_hovered_button->base->help_string);
|
||||||
}
|
}
|
||||||
Refresh(false);
|
Refresh(false);
|
||||||
}
|
}
|
||||||
|
@ -581,6 +581,15 @@ void wxRibbonToolBar::OnMouseMove(wxMouseEvent& evt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(new_hover)
|
||||||
|
{
|
||||||
|
SetToolTip(new_hover->help_string);
|
||||||
|
}
|
||||||
|
else if(GetToolTip())
|
||||||
|
{
|
||||||
|
UnsetToolTip();
|
||||||
|
}
|
||||||
|
|
||||||
if(new_hover != m_hover_tool)
|
if(new_hover != m_hover_tool)
|
||||||
{
|
{
|
||||||
if(m_hover_tool)
|
if(m_hover_tool)
|
||||||
|
Loading…
Reference in New Issue
Block a user