cpp/openttd-patchpack/source Changeset - r16245:5fda73d1d097

Changeset - r16245:5fda73d1d097

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 14 years ago 2010-10-16 23:13:05
frosch@openttd.org

(svn r20956) -Feature: Center new extra viewports on the tile below the mouse. Only center on center of main viewport if mouse is not in any viewport.

1 file changed with 7 insertions and 1 deletions:

src/viewport_gui.cpp

0 comments (0 inline, 0 general)

src/viewport_gui.cpp

➞

Show inline comments

@@ @@ -8,24 +8,25 @@ @@
  */
 /** @file viewport_gui.cpp Extra viewport window. */
 #include "stdafx.h"
 #include "landscape.h"
 #include "window_gui.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "strings_func.h"
 #include "zoom_func.h"
 #include "window_func.h"
 #include "tilehighlight_func.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 /** Widget numbers of the extra viewport window. */
 enum ExtraViewportWindowWidgets {
 	EVW_CAPTION,
 	EVW_VIEWPORT,
 	EVW_ZOOMIN,
 	EVW_ZOOMOUT,
 	EVW_MAIN_TO_VIEW,
 	EVW_VIEW_TO_MAIN,
@@ @@ -61,25 +62,30 @@ static const NWidgetPart _nested_extra_v @@
 class ExtraViewportWindow : public Window {
 public:
 	ExtraViewportWindow(const WindowDesc *desc, int window_number, TileIndex tile) : Window()
+	{
 		this->InitNested(desc, window_number);
 		NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(EVW_VIEWPORT);
 		nvp->InitializeViewport(this, 0, ZOOM_LVL_NORMAL);
 		this->DisableWidget(EVW_ZOOMIN);
 		Point pt;
 		if (tile == INVALID_TILE) {
 			/* the main window with the main view */
 			/* Use tile under mouse as center for new viewport */
 			Point pt = GetTileBelowCursor();
 			if (pt.x != -1) tile = TileVirtXY(pt.x, pt.y);
+		}
 		if (tile == INVALID_TILE) {
 			/* Still no tile? Use center of main viewport. */
 			const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
 			/* center on same place as main window (zoom is maximum, no adjustment needed) */
 			pt.x = w->viewport->scrollpos_x + w->viewport->virtual_width / 2;
 			pt.y = w->viewport->scrollpos_y + w->viewport->virtual_height / 2;
 		} else {
 			pt = RemapCoords(TileX(tile) * TILE_SIZE + TILE_SIZE / 2, TileY(tile) * TILE_SIZE + TILE_SIZE / 2, TileHeight(tile));
+		}
 		this->viewport->scrollpos_x = pt.x - this->viewport->virtual_width / 2;
 		this->viewport->scrollpos_y = pt.y - this->viewport->virtual_height / 2;
 		this->viewport->dest_scrollpos_x = this->viewport->scrollpos_x;

0 comments (0 inline, 0 general)