Merge branch 'enhanced_viewport_overlay' into jgrpp

# Conflicts:
#	src/misc_gui.cpp

src/window_gui.h

@@ -871,6 +871,7 @@ enum TooltipCloseCondition {
 	TCC_RIGHT_CLICK,
 	TCC_LEFT_CLICK,
 	TCC_HOVER,
+	TCC_HOVER_VIEWPORT,
 };
 
 void GuiShowTooltips(Window *parent, StringID str, uint paramcount = 0, const uint64 params[] = NULL, TooltipCloseCondition close_tooltip = TCC_HOVER);