Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 07:17:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR fixes

Browse source
This commit is contained in:
Thijs Wenker 2018-08-28 19:43:59 +02:00
parent c05fe7f0b7
commit c4d43b3fbc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/InteractiveWindow.qml
View file

@ -147,7 +147,7 @@ Windows.Window {
Qt.WindowMaximizeButtonHint | Qt.WindowMaximizeButtonHint |
Qt.WindowMinimizeButtonHint; Qt.WindowMinimizeButtonHint;
// only use the always on top feature for non Windows OS // only use the always on top feature for non Windows OS
if (Qt.platform.os !== "windows" && (flags & Desktop.ALWAYS_ON_TOP) === Desktop.ALWAYS_ON_TOP) { if (Qt.platform.os !== "windows" && (flags & Desktop.ALWAYS_ON_TOP)) {
nativeWindowFlags |= Qt.WindowStaysOnTopHint; nativeWindowFlags |= Qt.WindowStaysOnTopHint;
} }
nativeWindow.flags = nativeWindowFlags; nativeWindow.flags = nativeWindowFlags;

2
libraries/ui/src/MainWindow.cpp
View file

@ -43,7 +43,7 @@ MainWindow::~MainWindow() {
QWindow* MainWindow::findMainWindow() { QWindow* MainWindow::findMainWindow() {
auto windows = qApp->topLevelWindows(); auto windows = qApp->topLevelWindows();
QWindow* result = nullptr; QWindow* result = nullptr;
for (auto window : windows) { for (const auto& window : windows) {
if (window->objectName().contains("MainWindow")) { if (window->objectName().contains("MainWindow")) {
result = window; result = window;
break; break;