mirror of
https://github.com/aseprite/aseprite.git
synced 2025-03-17 13:20:45 +00:00
Merge branch 'master' of git@github.com:aseprite/aseprite.git
This commit is contained in:
commit
691c88c9d9
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user