Mercurial > hg > openttd

changeset 18477:45def1e34fa6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23321) -Fix (r23316): Extra viewports and waypoint detail opened up at wrong zoom level.
author peter1138 <peter1138@openttd.org>
date Thu, 24 Nov 2011 18:55:56 +0000
parents a1ed9c6140cb
children b4d2b25b6b02
files src/viewport_gui.cpp src/waypoint_gui.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -64,8 +64,8 @@
 		this->InitNested(desc, window_number);
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(EVW_VIEWPORT);
-		nvp->InitializeViewport(this, 0, ZOOM_LVL_NORMAL);
-		this->DisableWidget(EVW_ZOOMIN);
+		nvp->InitializeViewport(this, 0, ZOOM_LVL_VIEWPORT);
+		if (_settings_client.gui.zoom_min == ZOOM_LVL_VIEWPORT) this->DisableWidget(EVW_ZOOMIN);
 
 		Point pt;
 		if (tile == INVALID_TILE) {
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -76,7 +76,7 @@
 		this->flags4 |= WF_DISABLE_VP_SCROLL;
 
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WAYPVW_VIEWPORT);
-		nvp->InitializeViewport(this, this->GetCenterTile(), ZOOM_LVL_MIN);
+		nvp->InitializeViewport(this, this->GetCenterTile(), ZOOM_LVL_VIEWPORT);
 
 		this->OnInvalidateData(0);
 	}