From db581739772b6cd0f87816cf0a5615c03bcc00de Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Fri, 25 Jan 2019 15:10:53 -0800
Subject: [PATCH] fix mac issue

---
 interface/src/Application.cpp  | 14 ++++++++++++--
 interface/src/Application.h    |  1 +
 interface/src/ui/LogDialog.cpp | 21 +++++++++++++++++++++
 interface/src/ui/LogDialog.h   |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 34f29d2164..4d7d102fef 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -8107,8 +8107,18 @@ void Application::toggleLogDialog() {
         return;
     }
     if (! _logDialog) {
-        bool shouldSetParent = _keepLogWindowOnTop.get();
-        _logDialog = new LogDialog(shouldSetParent ? qApp->getWindow() : nullptr, getLogger());
+
+        bool keepOnTop =_keepLogWindowOnTop.get();
+#ifdef Q_OS_WIN
+        _logDialog = new LogDialog(keepOnTop ? qApp->getWindow() : nullptr, getLogger());
+#else
+        _logDialog = new LogDialog(nullptr, getLogger());
+
+        if (keepOnTop) {
+            Qt::WindowFlags flags = _logDialog->windowFlags() | Qt::Tool;
+            _logDialog->setWindowFlags(flags);
+        }
+#endif
     }
 
     if (_logDialog->isVisible()) {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 576283f5a3..ef41d8afb0 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -218,6 +218,7 @@ public:
 
     bool getDesktopTabletBecomesToolbarSetting() { return _desktopTabletBecomesToolbarSetting.get(); }
     bool getLogWindowOnTopSetting() { return _keepLogWindowOnTop.get(); }
+    void setLogWindowOnTopSetting(bool keepOnTop) { _keepLogWindowOnTop.set(keepOnTop); }
     void setDesktopTabletBecomesToolbarSetting(bool value);
     bool getHmdTabletBecomesToolbarSetting() { return _hmdTabletBecomesToolbarSetting.get(); }
     void setHmdTabletBecomesToolbarSetting(bool value);
diff --git a/interface/src/ui/LogDialog.cpp b/interface/src/ui/LogDialog.cpp
index f89df985ed..1eaad05e33 100644
--- a/interface/src/ui/LogDialog.cpp
+++ b/interface/src/ui/LogDialog.cpp
@@ -154,7 +154,11 @@ LogDialog::LogDialog(QWidget* parent, AbstractLoggerInterface* logger) : BaseLog
     _keepOnTopBox = new QCheckBox(" Keep window on top", this);
     bool isOnTop = qApp-> getLogWindowOnTopSetting();
     _keepOnTopBox->setCheckState(isOnTop ? Qt::Checked : Qt::Unchecked);
+#ifdef Q_OS_WIN
     connect(_keepOnTopBox, &QCheckBox::stateChanged, qApp, &Application::recreateLogWindow);
+#else
+    connect(_keepOnTopBox, &QCheckBox::stateChanged, this, &LogDialog::handleKeepWindowOnTop);
+#endif
     _keepOnTopBox->show();
 
     _extraDebuggingBox = new QCheckBox("Extra debugging", this);
@@ -248,6 +252,23 @@ void LogDialog::handleInfoPrintBox(int state) {
     printLogFile();
 }
 
+void LogDialog::handleKeepWindowOnTop(int state) {
+    bool keepOnTop = (state != 0);
+
+    Qt::WindowFlags flags = windowFlags();
+
+    if (keepOnTop) {
+        flags |= Qt::Tool;
+    } else {
+        flags &= ~Qt::Tool;
+    }
+
+    setWindowFlags(flags);
+    qApp->setLogWindowOnTopSetting(keepOnTop);
+
+    show();
+}
+
 void LogDialog::handleCriticalPrintBox(int state) {
     _logger->setCriticalPrint(state != 0);
     printLogFile();
diff --git a/interface/src/ui/LogDialog.h b/interface/src/ui/LogDialog.h
index 139ccb2240..d3ee81ca7e 100644
--- a/interface/src/ui/LogDialog.h
+++ b/interface/src/ui/LogDialog.h
@@ -34,6 +34,7 @@ public slots:
 private slots:
     void handleRevealButton();
     void handleExtraDebuggingCheckbox(int);
+    void handleKeepWindowOnTop(int);
     void handleDebugPrintBox(int);
     void handleInfoPrintBox(int);
     void handleCriticalPrintBox(int);