diff options
| author | peter1138 <peter1138@openttd.org> | 2011-11-24 18:55:56 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2011-11-24 18:55:56 +0000 |
| commit | 3e1aaa1235850da566b86bd003e99491e32c5569 (patch) | |
| tree | e903233b1e304f9a393de01b02fbddb40c67364b | |
| parent | 25a5257718ab5e70cf679411dd3ca4531923e7ed (diff) | |
| download | openttd-3e1aaa1235850da566b86bd003e99491e32c5569.tar.xz | |
(svn r23321) -Fix (r23316): Extra viewports and waypoint detail opened up at wrong zoom level.
| -rw-r--r-- | src/viewport_gui.cpp | 4 | ||||
| -rw-r--r-- | src/waypoint_gui.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp index 103b27cb2..f9d189cfb 100644 --- a/src/viewport_gui.cpp +++ b/src/viewport_gui.cpp @@ -64,8 +64,8 @@ public: 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) { diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 0ece60177..e3bb01ae8 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -76,7 +76,7 @@ public: 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); } |