From ef9c4c73c3ced82fc57deee6549995f55889abf3 Mon Sep 17 00:00:00 2001
From: BigBahss <tdennis4496@gmail.com>
Date: Tue, 13 Oct 2020 10:14:16 -0400
Subject: [PATCH] Remove scrollArea surrounding graphicsView_Map

---
 forms/mainwindow.ui | 134 +++++++-------------------------------------
 src/editor.cpp      |  28 ++-------
 src/mainwindow.cpp  |   1 -
 3 files changed, 25 insertions(+), 138 deletions(-)

diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index 3e7535e5..e79eebd8 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -350,129 +350,37 @@
                     <number>0</number>
                    </property>
                    <item row="0" column="0">
-                    <widget class="QScrollArea" name="scrollArea">
+                    <widget class="GraphicsView" name="graphicsView_Map">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                       <horstretch>1</horstretch>
+                       <horstretch>0</horstretch>
                        <verstretch>0</verstretch>
                       </sizepolicy>
                      </property>
+                     <property name="mouseTracking">
+                      <bool>false</bool>
+                     </property>
+                     <property name="autoFillBackground">
+                      <bool>false</bool>
+                     </property>
                      <property name="verticalScrollBarPolicy">
-                      <enum>Qt::ScrollBarAlwaysOff</enum>
+                      <enum>Qt::ScrollBarAsNeeded</enum>
                      </property>
                      <property name="horizontalScrollBarPolicy">
-                      <enum>Qt::ScrollBarAlwaysOff</enum>
+                      <enum>Qt::ScrollBarAsNeeded</enum>
                      </property>
-                     <property name="widgetResizable">
-                      <bool>true</bool>
+                     <property name="sizeAdjustPolicy">
+                      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+                     </property>
+                     <property name="dragMode">
+                      <enum>QGraphicsView::NoDrag</enum>
+                     </property>
+                     <property name="transformationAnchor">
+                      <enum>QGraphicsView::AnchorUnderMouse</enum>
+                     </property>
+                     <property name="resizeAnchor">
+                      <enum>QGraphicsView::AnchorUnderMouse</enum>
                      </property>
-                     <widget class="QWidget" name="scrollAreaWidgetContents_5">
-                      <property name="geometry">
-                       <rect>
-                        <x>0</x>
-                        <y>0</y>
-                        <width>543</width>
-                        <height>600</height>
-                       </rect>
-                      </property>
-                      <layout class="QGridLayout" name="gridLayout_8">
-                       <property name="leftMargin">
-                        <number>0</number>
-                       </property>
-                       <property name="topMargin">
-                        <number>0</number>
-                       </property>
-                       <property name="rightMargin">
-                        <number>0</number>
-                       </property>
-                       <property name="bottomMargin">
-                        <number>0</number>
-                       </property>
-                       <property name="spacing">
-                        <number>0</number>
-                       </property>
-                       <item row="1" column="2">
-                        <spacer name="horizontalSpacer_5">
-                         <property name="orientation">
-                          <enum>Qt::Horizontal</enum>
-                         </property>
-                         <property name="sizeHint" stdset="0">
-                          <size>
-                           <width>166</width>
-                           <height>16</height>
-                          </size>
-                         </property>
-                        </spacer>
-                       </item>
-                       <item row="1" column="0">
-                        <spacer name="horizontalSpacer_4">
-                         <property name="orientation">
-                          <enum>Qt::Horizontal</enum>
-                         </property>
-                         <property name="sizeHint" stdset="0">
-                          <size>
-                           <width>166</width>
-                           <height>16</height>
-                          </size>
-                         </property>
-                        </spacer>
-                       </item>
-                       <item row="0" column="1">
-                        <spacer name="verticalSpacer_4">
-                         <property name="orientation">
-                          <enum>Qt::Vertical</enum>
-                         </property>
-                         <property name="sizeHint" stdset="0">
-                          <size>
-                           <width>16</width>
-                           <height>166</height>
-                          </size>
-                         </property>
-                        </spacer>
-                       </item>
-                       <item row="1" column="1">
-                        <widget class="GraphicsView" name="graphicsView_Map">
-                         <property name="sizePolicy">
-                          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                           <horstretch>0</horstretch>
-                           <verstretch>0</verstretch>
-                          </sizepolicy>
-                         </property>
-                         <property name="mouseTracking">
-                          <bool>false</bool>
-                         </property>
-                         <property name="autoFillBackground">
-                          <bool>false</bool>
-                         </property>
-                         <property name="verticalScrollBarPolicy">
-                          <enum>Qt::ScrollBarAsNeeded</enum>
-                         </property>
-                         <property name="horizontalScrollBarPolicy">
-                          <enum>Qt::ScrollBarAsNeeded</enum>
-                         </property>
-                         <property name="sizeAdjustPolicy">
-                          <enum>QAbstractScrollArea::AdjustIgnored</enum>
-                         </property>
-                         <property name="dragMode">
-                          <enum>QGraphicsView::NoDrag</enum>
-                         </property>
-                        </widget>
-                       </item>
-                       <item row="2" column="1">
-                        <spacer name="verticalSpacer_3">
-                         <property name="orientation">
-                          <enum>Qt::Vertical</enum>
-                         </property>
-                         <property name="sizeHint" stdset="0">
-                          <size>
-                           <width>16</width>
-                           <height>166</height>
-                          </size>
-                         </property>
-                        </spacer>
-                       </item>
-                      </layout>
-                     </widget>
                     </widget>
                    </item>
                   </layout>
diff --git a/src/editor.cpp b/src/editor.cpp
index 9b052982..2652c4e6 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -898,33 +898,13 @@ void Editor::scaleMapView(int s) {
     if ((scale_exp + s) <= 5 && (scale_exp + s) >= -2)    // sane limits
     {
         if (s == 0)
-            s = -scale_exp;
-
-        scale_exp += s;
-
-        double base = scale_base;
-        double exp  = scale_exp;
-        double sfactor = pow(base, s);
-
-        const auto mapAnchor = ui->graphicsView_Map->transformationAnchor();
-        const auto connectionsAnchor = ui->graphicsView_Connections->transformationAnchor();
-        ui->graphicsView_Map->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
-        ui->graphicsView_Connections->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
+            scale_exp = 0;
+        else
+            scale_exp += s;
 
+        double sfactor = pow(scale_base, s);
         ui->graphicsView_Map->scale(sfactor, sfactor);
         ui->graphicsView_Connections->scale(sfactor, sfactor);
-
-        int width = static_cast<int>(ceil((scene->width()) * pow(base, exp))) + 2;
-        int height = static_cast<int>(ceil((scene->height()) * pow(base, exp))) + 2;
-        QSize viewSize = ui->scrollAreaWidgetContents_5->size();
-        int minWidth = qMin(width, viewSize.width());
-        int minHeight = qMin(height, viewSize.height());
-
-        ui->graphicsView_Map->setFixedSize(minWidth, minHeight);
-        ui->graphicsView_Connections->setFixedSize(minWidth, minHeight);
-
-        ui->graphicsView_Map->setTransformationAnchor(mapAnchor);
-        ui->graphicsView_Connections->setTransformationAnchor(connectionsAnchor);
     }
 }
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 394e58d8..38f51b9d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -563,7 +563,6 @@ void MainWindow::refreshMapScene()
 
     ui->graphicsView_Map->setScene(editor->scene);
     ui->graphicsView_Map->setSceneRect(editor->scene->sceneRect());
-    ui->graphicsView_Map->setFixedSize(width, height);
     ui->graphicsView_Map->editor = editor;
 
     ui->graphicsView_Connections->setScene(editor->scene);