From 8eab3abb15b30770a8f08c25165db53a1f8a5d47 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 19 Jun 2014 19:02:42 +0200
Subject: [PATCH] Fix initial view offset for large world maps (Fixes #1523)

---
 apps/openmw/mwgui/mapwindow.cpp      | 7 +++----
 files/mygui/openmw_map_window.layout | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index db3cfadde..af26456f2 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -431,6 +431,9 @@ namespace MWGui
     {
         mGlobalMapRender = new MWRender::GlobalMap("");
         mGlobalMapRender->render(loadingListener);
+        mGlobalMap->setCanvasSize (mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
+        mGlobalMapImage->setSize(mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
+
         mGlobalMapImage->setImageTexture("GlobalMap.png");
         mGlobalMapOverlay->setImageTexture("GlobalMapOverlay");
     }
@@ -512,7 +515,6 @@ namespace MWGui
         else
             mGlobalMap->setViewOffset( mGlobalMap->getViewOffset() + diff );
 
-
         mLastDragPos = MyGUI::IntPoint(_left, _top);
     }
 
@@ -536,9 +538,6 @@ namespace MWGui
 
     void MapWindow::open()
     {
-        mGlobalMap->setCanvasSize (mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
-        mGlobalMapImage->setSize(mGlobalMapRender->getWidth(), mGlobalMapRender->getHeight());
-
         // force markers to foreground
         for (unsigned int i=0; i<mGlobalMapOverlay->getChildCount (); ++i)
         {
diff --git a/files/mygui/openmw_map_window.layout b/files/mygui/openmw_map_window.layout
index 6e0efce7e..b842888a1 100644
--- a/files/mygui/openmw_map_window.layout
+++ b/files/mygui/openmw_map_window.layout
@@ -17,8 +17,6 @@
 
         <!-- Global map -->
         <Widget type="ScrollView" skin="MW_MapView" position="0 0 284 264" align="Stretch" name="GlobalMap">
-            <Property key="CanvasSize" value="1536 1536"/>
-
             <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="GlobalMapImage">
                 <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="GlobalMapOverlay"/>
             </Widget>