Merge branch 'main' into beta

rollyhuang · Nov 21, 2024 · ae9e358 · ae9e358
2 parents 9bc16e9 + 45c2a59
commit ae9e358
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/script/dialog_class.cpp b/src/app/script/dialog_class.cpp
@@ -80,6 +80,7 @@ class DialogWindow : public WindowWithHand {
     if (m_handTool && Editor::activeEditor()) {
       enableHandTool(true);
     }
+    WindowWithHand::onOpen(ev);
   }
 
   void onBeforeClose(CloseEvent& ev) override {

diff --git a/src/ui/window.cpp b/src/ui/window.cpp
@@ -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);
   }
 }