From 2e66b27372b3547ea98ec914974c4fcdedd08053 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 18 Mar 2015 00:08:56 -0400
Subject: Map editor widget now starts out centered

---
 tools/mapedit/src/frame.cpp  |  1 +
 tools/mapedit/src/widget.cpp | 17 ++++++++++-------
 tools/mapedit/src/widget.h   |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/mapedit/src/frame.cpp b/tools/mapedit/src/frame.cpp
index b8b4326..cc45c29 100644
--- a/tools/mapedit/src/frame.cpp
+++ b/tools/mapedit/src/frame.cpp
@@ -341,6 +341,7 @@ MapeditFrame::MapeditFrame(World* world) : wxFrame(NULL, wxID_ANY, "Map Editor")
   dontSelectMap = false;
   
   SetStartposLabel();
+  mapEditor->SetUpZoom(2);
 }
 
 void MapeditFrame::OnExit(wxCloseEvent& event)
diff --git a/tools/mapedit/src/widget.cpp b/tools/mapedit/src/widget.cpp
index c74b194..aaebd38 100644
--- a/tools/mapedit/src/widget.cpp
+++ b/tools/mapedit/src/widget.cpp
@@ -38,17 +38,20 @@ void MapeditWidget::Init()
   
   this->FitInside();
   this->SetScrollRate(5, 5);
-  
-  SetVirtualSize(EDITOR_WIDTH, EDITOR_HEIGHT);
-  
-  int cW, cH;
+}
+
+void MapeditWidget::SetUpZoom(int zoom)
+{
+  int cW, cH, vXX, vXY;
   GetClientSize(&cW, &cH);
+  GetScrollPixelsPerUnit(&vXX, &vXY);
+  
   mousePos.x = cW / 2;
   mousePos.y = cH / 2;
   
-//  Scroll(GAME_WIDTH*1.5-mousePos.x, GAME_HEIGHT*1.5-mousePos.y);
-  
-  SetZoomSize(2);
+  scale = zoom;
+  SetVirtualSize(EDITOR_WIDTH * scale, EDITOR_HEIGHT * scale);
+  Scroll((EDITOR_WIDTH*scale-cW)/2/vXX, (EDITOR_HEIGHT*scale-cH)/2/vXY);
 }
 
 wxSize MapeditWidget::DoGetBestSize() const
diff --git a/tools/mapedit/src/widget.h b/tools/mapedit/src/widget.h
index b019088..c1bff31 100644
--- a/tools/mapedit/src/widget.h
+++ b/tools/mapedit/src/widget.h
@@ -30,6 +30,7 @@ class MapeditWidget : public wxScrolledCanvas {
     MapeditWidget();
     MapeditWidget(wxWindow* parent, wxWindowID winid, Map* map, TileWidget* tileWidget, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize);
     
+    void SetUpZoom(int zoom);
     void ZoomIn();
     void ZoomOut();
     void SetEditMode(EditMode editMode);
-- 
cgit 1.4.1