From b699bdd4ca5db5be8ab7d4a13831a83b44d4ee06 Mon Sep 17 00:00:00 2001
From: Yuriy Puchkov <yuriy.puchkov@namecheap.com>
Date: Tue, 23 Feb 2021 13:52:23 +0200
Subject: [PATCH] fix - MacOS - Tool Settings on secondary display is at
 strange position

(cherry picked from commit 672af784c5a459b5bcb617cf4a858edc98de9173)
---
 src/widgets/capture/capturewidget.cpp | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp
index df5a7313..59f1178a 100644
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -707,19 +707,10 @@ void CaptureWidget::initPanel()
     if (m_context.fullscreen) {
 #if (defined(Q_OS_MACOS) || defined(Q_OS_LINUX))
         QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
-
-        if (currentScreen) {
-            panelRect = currentScreen->geometry();
-            auto devicePixelRatio = currentScreen->devicePixelRatio();
-            panelRect.moveTo(panelRect.x() / devicePixelRatio,
-                             panelRect.y() / devicePixelRatio);
-        } else {
-            panelRect = QGuiApplication::primaryScreen()->geometry();
-            auto devicePixelRatio =
-              QGuiApplication::primaryScreen()->devicePixelRatio();
-            panelRect.moveTo(panelRect.x() / devicePixelRatio,
-                             panelRect.y() / devicePixelRatio);
-        }
+        panelRect = currentScreen->geometry();
+        auto devicePixelRatio = currentScreen->devicePixelRatio();
+        panelRect.moveTo(panelRect.x() / devicePixelRatio,
+                         panelRect.y() / devicePixelRatio);
 #else
         panelRect = QGuiApplication::primaryScreen()->geometry();
         auto devicePixelRatio =
@@ -729,18 +720,22 @@ void CaptureWidget::initPanel()
 #endif
     }
 
-    ConfigHandler config;
-
-    if (config.showSidePanelButtonValue()) {
+    if (ConfigHandler().showSidePanelButtonValue()) {
         auto* panelToggleButton =
           new OrientablePushButton(tr("Tool Settings"), this);
         makeChild(panelToggleButton);
         panelToggleButton->setColor(m_uiColor);
         panelToggleButton->setOrientation(
           OrientablePushButton::VerticalBottomToTop);
+#if defined(Q_OS_MACOS)
+        panelToggleButton->move(0,
+                                panelRect.y() + panelRect.height() / 2 -
+                                  panelToggleButton->width() / 2);
+#else
         panelToggleButton->move(panelRect.x(),
                                 panelRect.y() + panelRect.height() / 2 -
                                   panelToggleButton->width() / 2);
+#endif
         panelToggleButton->setCursor(Qt::ArrowCursor);
         (new DraggableWidgetMaker(this))->makeDraggable(panelToggleButton);
         connect(panelToggleButton,