From 1a74ba130b6cd263b588c7fdb034f04e1bf2d6d3 Mon Sep 17 00:00:00 2001
From: Muhammad Mominul Huque <mominul2082@gmail.com>
Date: Thu, 24 Sep 2020 16:50:05 +0600
Subject: [PATCH] Don't bypass window manager Remove the special window flags
 for linux

---
 src/frontend/TopBar.cpp | 6 ------
 src/frontend/TopBar.ui  | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/frontend/TopBar.cpp b/src/frontend/TopBar.cpp
index e29efeb2..61b3fab2 100644
--- a/src/frontend/TopBar.cpp
+++ b/src/frontend/TopBar.cpp
@@ -76,13 +76,7 @@ TopBar::~TopBar() {
 }
 
 void TopBar::SetupTopBar() {
-#if defined(linux) || defined(__linux__) || defined(__linux)
-  this->setWindowFlags(
-      Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint |
-          Qt::WindowDoesNotAcceptFocus | Qt::NoDropShadowWindowHint);
-#else
   this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
-#endif
   this->setFixedSize(QSize(this->width(), this->height()));
 
   if (gSettings->getTopBarWindowPosition() == QPoint(0, 0)) {
diff --git a/src/frontend/TopBar.ui b/src/frontend/TopBar.ui
index f7da4e01..7ad890a7 100644
--- a/src/frontend/TopBar.ui
+++ b/src/frontend/TopBar.ui
@@ -72,7 +72,7 @@
      </rect>
     </property>
     <property name="toolTip">
-     <string>View information about current layout</string>
+     <string>View information about the current layout</string>
     </property>
     <property name="icon">
      <iconset resource="images.qrc">
@@ -117,6 +117,9 @@
       <height>27</height>
      </rect>
     </property>
+    <property name="toolTip">
+     <string>Quit</string>
+    </property>
     <property name="text">
      <string/>
     </property>