mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 05:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tooltip flicker on ToolBar

Browse Source
This commit is contained in:
David Capello 2014-04-13 21:20:06 -03:00
parent 31e1b4e387
commit cd464f6694
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/ui/toolbar.cpp
View File

@ -223,15 +223,17 @@ bool ToolBar::onProcessMessage(Message* msg)
// hot button changed // hot button changed
if (new_hot_tool != m_hotTool || if (new_hot_tool != m_hotTool ||
new_hot_index != m_hotIndex) { new_hot_index != m_hotIndex) {
m_hotTool = new_hot_tool; m_hotTool = new_hot_tool;
m_hotIndex = new_hot_index; m_hotIndex = new_hot_index;
invalidate(); invalidate();
if (!m_currentStrip) {
if (m_hotIndex != NoneIndex && !hasCapture()) if (m_hotIndex != NoneIndex && !hasCapture())
openTipWindow(m_hotIndex, m_hotTool); openTipWindow(m_hotIndex, m_hotTool);
else else
closeTipWindow(); closeTipWindow();
}
if (m_hotTool) { if (m_hotTool) {
if (hasCapture()) if (hasCapture())
@ -273,12 +275,13 @@ bool ToolBar::onProcessMessage(Message* msg)
closeTipWindow(); closeTipWindow();
if (!m_popupWindow) if (!m_popupWindow || !m_popupWindow->isVisible()) {
m_tipOpened = false; m_tipOpened = false;
m_hotTool = NULL; m_hotTool = NULL;
m_hotIndex = NoneIndex; m_hotIndex = NoneIndex;
invalidate(); invalidate();
}
StatusBar::instance()->clearText(); StatusBar::instance()->clearText();
break; break;
@ -617,6 +620,7 @@ void ToolBar::onClosePopup()
m_openOnHot = false; m_openOnHot = false;
m_hotTool = NULL; m_hotTool = NULL;
m_hotIndex = NoneIndex;
m_currentStrip = NULL; m_currentStrip = NULL;
invalidate(); invalidate();