Merge branch 'main' into beta

This commit is contained in:
David Capello 2024-11-21 19:09:50 -03:00
commit ae9e3583a4
2 changed files with 6 additions and 2 deletions

View File

@ -80,6 +80,7 @@ protected:
if (m_handTool && Editor::activeEditor()) {
enableHandTool(true);
}
WindowWithHand::onOpen(ev);
}
void onBeforeClose(CloseEvent& ev) override {

View File

@ -719,8 +719,11 @@ void Window::onSetText()
void Window::onVisible(bool visible)
{
Widget::onVisible(visible);
if (get_multiple_displays() && m_display) {
display()->nativeWindow()->setVisible(visible);
Display* display = this->display();
if (ownDisplay() &&
display &&
display->nativeWindow()) {
display->nativeWindow()->setVisible(visible);
}
}