Merge remote-tracking branch 'origin/master' into HEAD

src/settings.cpp

@@ -54,6 +54,7 @@
 #include "base_media_base.h"
 #include "gamelog.h"
 #include "settings_func.h"
+#include "settings_gui.h"
 #include "ini_type.h"
 #include "ai/ai_config.hpp"
 #include "ai/ai.hpp"
@@ -64,6 +65,7 @@
 #include "roadveh.h"
 #include "fios.h"
 #include "strings_func.h"
+#include "toolbar_gui.h"
 
 #include "void_map.h"
 #include "station_base.h"
@@ -1078,6 +1080,16 @@ static bool ZoomMinMaxChanged(int32 p1)
 	return true;
 }
 
+static bool VerticalToolbarChanged(int32 p1)
+{
+	if (FindWindowByClass(WC_MAIN_TOOLBAR)) {
+		HideVitalWindows();
+		ShowVitalWindows();
+		ReInitAllWindows();
+	}
+	return true;
+}
+
 /**
  * Update any possible saveload window and delete any newgrf dialogue as
  * its widget parts might change. Reinit all windows as it allows access to the