From 6e9507f0822f76bba63f29fba6a78d1f14f34b9f Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 23 Sep 2017 10:13:22 -0700
Subject: [PATCH] Qt: Map Viewer touchups

---
 src/platform/qt/MapView.cpp | 10 +++++++++-
 src/platform/qt/MapView.ui  | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/platform/qt/MapView.cpp b/src/platform/qt/MapView.cpp
index 0d4460a99..b303a2c82 100644
--- a/src/platform/qt/MapView.cpp
+++ b/src/platform/qt/MapView.cpp
@@ -65,7 +65,11 @@ void MapView::selectMap(int map) {
 	if (map >= mMapCacheSetSize(&m_cacheSet->maps)) {
 		return;
 	}
+	if (map == m_map) {
+		return;
+	}
 	m_map = map;
+	updateTiles(true);
 }
 
 #ifdef M_CORE_GBA
@@ -88,7 +92,11 @@ void MapView::updateTilesGBA(bool force) {
 		}
 	}
 	bg = bg.convertToFormat(QImage::Format_RGB32).rgbSwapped();
-	m_ui.map->setPixmap(QPixmap::fromImage(bg));
+	QPixmap map = QPixmap::fromImage(bg);
+	if (m_ui.magnification->value() > 1) {
+		map = map.scaled(map.size() * m_ui.magnification->value());
+	}
+	m_ui.map->setPixmap(map);
 }
 #endif
 
diff --git a/src/platform/qt/MapView.ui b/src/platform/qt/MapView.ui
index 3e4a9c2d1..ce8c34852 100644
--- a/src/platform/qt/MapView.ui
+++ b/src/platform/qt/MapView.ui
@@ -32,6 +32,18 @@
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <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>
        <item>
         <widget class="QLabel" name="map">
          <property name="text">
@@ -39,6 +51,19 @@
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>