diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp index 641ecd354..a9017cc91 100644 --- a/src/app/ui/skin/skin_theme.cpp +++ b/src/app/ui/skin/skin_theme.cpp @@ -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 } } diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp index 8d11eb5d2..3fa11d186 100644 --- a/src/ui/widget.cpp +++ b/src/ui/widget.cpp @@ -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