Merge branch 'save_ext' into auto_timetables-sx

src/widgets/dropdown.cpp

@@ -82,7 +82,7 @@ static const NWidgetPart _nested_dropdown_menu_widgets[] = {
 static WindowDesc _dropdown_desc(
 	WDP_MANUAL, NULL, 0, 0,
 	WC_DROPDOWN_MENU, WC_NONE,
-	0,
+	WDF_NO_FOCUS,
 	_nested_dropdown_menu_widgets, lengthof(_nested_dropdown_menu_widgets)
 );
 

src/widgets/newgrf_debug_widget.h

@@ -25,19 +25,21 @@ enum NewGRFInspectWidgets {
 
 /** Widgets of the #SpriteAlignerWindow class. */
 enum SpriteAlignerWidgets {
-	WID_SA_CAPTION,   ///< Caption of the window.
-	WID_SA_PREVIOUS,  ///< Skip to the previous sprite.
-	WID_SA_GOTO,      ///< Go to a given sprite.
-	WID_SA_NEXT,      ///< Skip to the next sprite.
-	WID_SA_UP,        ///< Move the sprite up.
-	WID_SA_LEFT,      ///< Move the sprite to the left.
-	WID_SA_RIGHT,     ///< Move the sprite to the right.
-	WID_SA_DOWN,      ///< Move the sprite down.
-	WID_SA_SPRITE,    ///< The actual sprite.
-	WID_SA_OFFSETS,   ///< The sprite offsets.
-	WID_SA_PICKER,    ///< Sprite picker.
-	WID_SA_LIST,      ///< Queried sprite list.
-	WID_SA_SCROLLBAR, ///< Scrollbar for sprite list.
+	WID_SA_CAPTION,     ///< Caption of the window.
+	WID_SA_PREVIOUS,    ///< Skip to the previous sprite.
+	WID_SA_GOTO,        ///< Go to a given sprite.
+	WID_SA_NEXT,        ///< Skip to the next sprite.
+	WID_SA_UP,          ///< Move the sprite up.
+	WID_SA_LEFT,        ///< Move the sprite to the left.
+	WID_SA_RIGHT,       ///< Move the sprite to the right.
+	WID_SA_DOWN,        ///< Move the sprite down.
+	WID_SA_SPRITE,      ///< The actual sprite.
+	WID_SA_OFFSETS_ABS, ///< The sprite offsets (absolute).
+	WID_SA_OFFSETS_REL, ///< The sprite offsets (relative).
+	WID_SA_PICKER,      ///< Sprite picker.
+	WID_SA_LIST,        ///< Queried sprite list.
+	WID_SA_SCROLLBAR,   ///< Scrollbar for sprite list.
+	WID_SA_RESET_REL,   ///< Reset relative sprite offset
 };
 
 #endif /* WIDGETS_NEWGRF_DEBUG_WIDGET_H */