Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/russian.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/news_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
This commit is contained in:
Jonathan G Rennison
2022-10-19 18:35:35 +01:00
19 changed files with 182 additions and 47 deletions

View File

@@ -28,6 +28,7 @@
#include "table/strings.h"
#include "safeguards.h"
#include "zoom_func.h"
/** GUI for accessing waypoints and buoys. */
struct WaypointWindow : Window {
@@ -100,7 +101,7 @@ public:
this->flags |= WF_DISABLE_VP_SCROLL;
NWidgetViewport *nvp = this->GetWidget<NWidgetViewport>(WID_W_VIEWPORT);
nvp->InitializeViewport(this, this->GetCenterTile(), ZOOM_LVL_VIEWPORT);
nvp->InitializeViewport(this, this->GetCenterTile(), ScaleZoomGUI(ZOOM_LVL_VIEWPORT));
this->OnInvalidateData(0);
}