Fixed issue #526. Dialog Detail is not on top after selection second object on

Mac.
(grafted from acde5cf1164d8227d71e7ff41ce03b45cbe7c9dd)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-07-09 13:57:37 +03:00
parent e76a174ff0
commit f56f2a0209
3 changed files with 5 additions and 0 deletions

View File

@ -49,6 +49,7 @@
- [#516] Valentina crashes when use "Point intersect line and axis" instrument. - [#516] Valentina crashes when use "Point intersect line and axis" instrument.
- [#483] File lost. - [#483] File lost.
- Fixed Bisector tool bug. The tool created internal variable for wrong segment. - 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 # Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

View File

@ -3099,6 +3099,8 @@ void MainWindow::ActionHistory(bool checked)
dialogHistory->setWindowFlags(Qt::Window); dialogHistory->setWindowFlags(Qt::Window);
connect(this, &MainWindow::RefreshHistory, dialogHistory.data(), &DialogHistory::UpdateHistory); connect(this, &MainWindow::RefreshHistory, dialogHistory.data(), &DialogHistory::UpdateHistory);
connect(dialogHistory.data(), &DialogHistory::DialogClosed, this, &MainWindow::ClosedActionHistory); 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(); dialogHistory->show();
} }
else else

View File

@ -130,6 +130,8 @@ void DialogDetail::ChosenObject(quint32 id, const SceneObject &type)
} }
ValidObjects(DetailIsValid()); ValidObjects(DetailIsValid());
// Fix issue #526. Dialog Detail is not on top after selection second object on Mac.
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
this->show(); this->show();
} }
} }