mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-18 16:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:aseprite/aseprite.git

Browse Source
This commit is contained in:
David Capello 2015-03-27 17:29:31 -03:00
commit 691c88c9d9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/ui/skin/skin_theme.cpp
View File

@ -2172,7 +2172,7 @@ she::Font* SkinTheme::loadFont(const char* userFont, const std::string& path)
f->setSize(8);
return f;
}
catch (const std::exception& ex) {
catch (const std::exception&) {
// Do nothing
}
}

5
src/ui/widget.cpp
View File

@ -288,15 +288,18 @@ void Widget::setFocusMagnet(bool state)
bool Widget::isVisible() const
{
const Widget* widget = this;
const Widget* lastWidget = nullptr;
do {
if (widget->flags & JI_HIDDEN)
return false;
lastWidget = widget;
widget = widget->m_parent;
} while (widget);
return true;
// The widget is visible if it's inside a visible manager
return (lastWidget ? lastWidget->type == kManagerWidget: false);
}
bool Widget::isEnabled() const