mirror of
https://github.com/aseprite/aseprite.git
synced 2024-12-29 09:23:32 +00:00
Merge branch 'main' into beta
This commit is contained in:
commit
ae9e3583a4
@ -80,6 +80,7 @@ protected:
|
||||
if (m_handTool && Editor::activeEditor()) {
|
||||
enableHandTool(true);
|
||||
}
|
||||
WindowWithHand::onOpen(ev);
|
||||
}
|
||||
|
||||
void onBeforeClose(CloseEvent& ev) override {
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user