From f56f2a0209bb0439f403a07121784487875b1425 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 9 Jul 2016 13:57:37 +0300 Subject: [PATCH] Fixed issue #526. Dialog Detail is not on top after selection second object on Mac. (grafted from acde5cf1164d8227d71e7ff41ce03b45cbe7c9dd) --HG-- branch : develop --- ChangeLog.txt | 1 + src/app/valentina/mainwindow.cpp | 2 ++ src/libs/vtools/dialogs/tools/dialogdetail.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 81933da38..780fa2465 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -49,6 +49,7 @@ - [#516] Valentina crashes when use "Point intersect line and axis" instrument. - [#483] File lost. - Fixed Bisector tool bug. The tool created internal variable for wrong segment. +- [#526] Dialog Detail is not on top after selection second object on Mac. # Version 0.4.4 April 12, 2016 - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index b6d8f9069..015887aff 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -3099,6 +3099,8 @@ void MainWindow::ActionHistory(bool checked) dialogHistory->setWindowFlags(Qt::Window); connect(this, &MainWindow::RefreshHistory, dialogHistory.data(), &DialogHistory::UpdateHistory); connect(dialogHistory.data(), &DialogHistory::DialogClosed, this, &MainWindow::ClosedActionHistory); + // Fix issue #526. Dialog Detail is not on top after selection second object on Mac. + dialogHistory->setWindowFlags(dialogHistory->windowFlags() | Qt::WindowStaysOnTopHint); dialogHistory->show(); } else diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 44d2e2939..e79102c4e 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -130,6 +130,8 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type) } ValidObjects(DetailIsValid()); + // Fix issue #526. Dialog Detail is not on top after selection second object on Mac. + setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); this->show(); } }