mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-30 13:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close toolbar popup when the document is closed

Browse Source
This commit is contained in:
David Capello 2016-12-07 11:12:19 -03:00
parent 0c8b5c6a4f
commit 315584d819
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,17 @@ void ToolBar::onPaint(ui::PaintEvent& ev)
}
}
void ToolBar::onVisible(bool visible)
{
Widget::onVisible(visible);
if (!visible) {
if (m_popupWindow) {
closePopupWindow();
closeTipWindow();
}
}
}
int ToolBar::getToolGroupIndex(ToolGroup* group)
{
ToolBox* toolbox = App::instance()->toolBox();
@ -377,11 +388,7 @@ void ToolBar::openPopupWindow(int group_index, ToolGroup* tool_group)
m_closeConn.disconnect();
onClosePopup();
// Close the current popup window
m_popupWindow->closeWindow(NULL);
delete m_popupWindow;
m_popupWindow = NULL;
closePopupWindow();
}
// Close tip window
@ -435,6 +442,15 @@ void ToolBar::openPopupWindow(int group_index, ToolGroup* tool_group)
toolstrip->setBounds(rc);
}
void ToolBar::closePopupWindow()
{
if (m_popupWindow) {
m_popupWindow->closeWindow(nullptr);
delete m_popupWindow;
m_popupWindow = nullptr;
}
}
Rect ToolBar::getToolGroupBounds(int group_index)
{
ToolBox* toolbox = App::instance()->toolBox();

2
src/app/ui/toolbar.h
View File

@ -51,10 +51,12 @@ namespace app {
bool onProcessMessage(ui::Message* msg) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
void onVisible(bool visible) override;
private:
int getToolGroupIndex(tools::ToolGroup* group);
void openPopupWindow(int group_index, tools::ToolGroup* group);
void closePopupWindow();
gfx::Rect getToolGroupBounds(int group_index);
gfx::Point getToolPositionInGroup(int group_index, tools::Tool* tool);
void openTipWindow(int group_index, tools::Tool* tool);

9
src/ui/widget.cpp
View File

@ -192,12 +192,16 @@ void Widget::setVisible(bool state)
if (hasFlags(HIDDEN)) {
disableFlags(HIDDEN);
invalidate();
onVisible(true);
}
}
else {
if (!hasFlags(HIDDEN)) {
manager()->freeWidget(this); // Free from manager
enableFlags(HIDDEN);
onVisible(false);
}
}
}
@ -1443,6 +1447,11 @@ void Widget::onSetDecorativeWidgetBounds()
}
}
void Widget::onVisible(bool visible)
{
// Do nothing
}
void Widget::onEnable(bool enabled)
{
// Do nothing

1
src/ui/widget.h
View File

@ -372,6 +372,7 @@ namespace ui {
virtual void onBroadcastMouseMessage(WidgetsList& targets);
virtual void onInitTheme(InitThemeEvent& ev);
virtual void onSetDecorativeWidgetBounds();
virtual void onVisible(bool visible);
virtual void onEnable(bool enabled);
virtual void onSelect(bool selected);
virtual void onSetText();