From c19221cd37b53437ed0e45a11ef44ddd706fafaf Mon Sep 17 00:00:00 2001
From: ArsenArsen <arsenarsentmc@outlook.com>
Date: Thu, 3 Aug 2017 22:00:15 +0200
Subject: [PATCH] Make single screen overlays better

---
 colorpicker/colorpickerscene.cpp | 6 +++++-
 cropeditor/cropeditor.cpp        | 5 ++++-
 cropeditor/cropscene.cpp         | 2 +-
 cropeditor/cropscene.hpp         | 1 -
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/colorpicker/colorpickerscene.cpp b/colorpicker/colorpickerscene.cpp
index ad02c24..5899e8f 100644
--- a/colorpicker/colorpickerscene.cpp
+++ b/colorpicker/colorpickerscene.cpp
@@ -34,7 +34,11 @@ ColorPickerScene::ColorPickerScene(QPixmap pixmap, QWidget *parentWidget)
     ellipse->setBrush(color);
     image = pixmap.toImage();
 
-    show();
+    if (QApplication::screens().size() == 1)
+        showFullScreen();
+    else
+        show();
+
     activateWindow();
     setGeometry(pixmap.rect());
     QPoint p = screenshotutil::smallestScreenCoordinate()
diff --git a/cropeditor/cropeditor.cpp b/cropeditor/cropeditor.cpp
index 511cd49..81ab8a6 100644
--- a/cropeditor/cropeditor.cpp
+++ b/cropeditor/cropeditor.cpp
@@ -13,7 +13,10 @@
 CropEditor::CropEditor(QPixmap image, QObject *parent) : QObject(parent) {
     scene = new CropScene(parent, image);
     view = new CropView(scene);
-    view->show();
+    if (QApplication::screens().size() > 1)
+        view->show();
+    else
+        view->showFullScreen();
     view->raise();
     QGraphicsPixmapItem *pixmapItem = new QGraphicsPixmapItem(image);
     pixmapItem->setZValue(-1);
diff --git a/cropeditor/cropscene.cpp b/cropeditor/cropscene.cpp
index 33a6b49..1c70f71 100644
--- a/cropeditor/cropscene.cpp
+++ b/cropeditor/cropscene.cpp
@@ -200,9 +200,9 @@ void CropScene::show() {
 
 void CropScene::setVisible(bool visible) {
     for (auto view : views()) {
-        if (view->isVisible()) fullscreen |= view->isFullScreen();
         view->setVisible(visible);
         if (visible) {
+            if (QApplication::screens().size() == 1) view->showFullScreen();
             view->resize(_pixmap.width(), _pixmap.height());
             view->setMinimumSize(_pixmap.size());
             QPoint p = screenshotutil::smallestScreenCoordinate() + QPoint(settings::settings().value("cropx", 0).toInt(),
diff --git a/cropeditor/cropscene.hpp b/cropeditor/cropscene.hpp
index 8dce960..c965153 100644
--- a/cropeditor/cropscene.hpp
+++ b/cropeditor/cropscene.hpp
@@ -61,7 +61,6 @@ private:
     void updateMag();
     void initMagnifierGrid();
     void addDrawingAction(QMenuBar *menu, QString name, QString icon, std::function<DrawItem *()> item);
-    bool fullscreen;
     QPointF cursorPos;
     std::function<DrawItem *()> drawingSelectionMaker;
     QFlags<Qt::MouseButton> prevButtons;