Merge lp:~widelands-dev/widelands/bug-536489-dropdown into lp:widelands

[GunChleoc]

Implemented a textual dropdown menu. It is used in:
- Options: Screen resolution
- Options: Language. Got rid of the extra Language tab and moved it to the Interface tab.
- Launch Single Player Game: Win Condition

My first branch for Build 20 ;)

Implemented a textual dropdown menu. This is already quite a bit of code, so I'll do the win condition for multiplayer in a separate branch. We will also want pictorial dropdowns.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1345. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/161548228.
Appveyor build 1187. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1187.

[Klaus Halfmann (klaus-halfmann)]

This Drodown is missing a feature found in all normal GUIs:

when you click outside the dropdown it will NOT collapse,
allowing the user to click somewhere else.
This implementation will do nothing in this case.
So if I forgot that the Dropdown is open and click somwhere else
It seems stuck as I get no visual feedback what to do.
This may frustrate players upto a level where theey will kill the game.

In additon it does not collapse when pressing Escape,
instead the complete dialog is canceled.

Sorry Gun.

Good work otherwise. I will continue to review the usage and code.

review: Needs Fixing (compile, test)

[GunChleoc (gunchleoc)]

Good points. The escape key thing should be easy to do, for the collapse when clicked outside of it I will need to dig around a bit.

Thanks for testing!

[GunChleoc (gunchleoc)]

Ready for the next round. It is now possible to navigate through the list with the keyboard as well.

Note: I forgot that Esc should cancel the change in the list, will still do that.

Handling a mouse click outside of a panel is tricky, so I autoclose if the mouse moves outside the panel. I gave this some distance so that the list won't disappear on users when they move the mouse 1 pixel off, let me know if we need to widen that. The tolerance is currently 50 pixels, and 25 for moving up.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1345. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/161548228.
Appveyor build 1187. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1187.

[Klaus Halfmann (klaus-halfmann)]

Hello Gun,
thanks for your work.

* the Autoclose when leaving feels reasonbale. OK for me
* Esc-Key is handled as expected.

There is one confusion however:
The menu has a Selection - via a background color - and a checkmark.
When I use the cursor keys to scroll both, the selection and the
checkmark change. So I assume I made the choice. When I then leave
the list, I find that my selection was not applied (so the checkmark is wrong).

Please improve as follows: do not move the checkmark until the selection
in finally confirmed by clicking or by pressing return.

review: Needs Fixing (compile, test)

[kaputtnik (franku)]

I get a crash as soon i click on one of the dropdown menus in options:

src/ui_basic/panel.h:265: bool UI::Panel::has_focus() const: Assertion `get_can_focus()' failed.

Backtrace: https://bugs.launchpad.net/widelands/+bug/536489/+attachment/4750279/+files/backtrace.txt

review: Needs Fixing

[GunChleoc (gunchleoc)]

How would it be if there was no checkmark at all? Would that be confusing when the dropdown gets opens?

[Klaus Halfmann (klaus-halfmann)]

> How would it be if there was no checkmark at all?
> Would that be confusing when the dropdown gets opens?

Hm, the checkmark is a good and normal hint what the
current selection is. But you can completly drop it, in case
it is to diffult otherwise.

In the End you are our User-Interface Department.

[GunChleoc (gunchleoc)]

Maybe I am, but your input is very helpful!

I just gave it a spin, I think it would be best if the mouse position / current selection gets highlighted, and no tick. Back to the drawing board :)

[kaputtnik (franku)]

Thanks for fixing the crash :-)

The checkmark is IMHO good now.

But clicking on the vertical slider in Options->Language let the drop down menu disappear.

review: Needs Fixing

[GunChleoc (gunchleoc)]

Collapse with the scrollbar should be fixed now. Also instant highlighting for mouse movement.

review: Needs Resubmitting

[Klaus Halfmann (klaus-halfmann)]

last night I updated to OSX-Sierra

* The good news: Widelands starts (last status compiled form this branch)
* The bad one: When compiling it complains about some system headers.

I will open another Bug to collect this Issues, maybe I can fix them easily,

[Klaus Halfmann (klaus-halfmann)]

OK, fine for me, I did not take a deep look at that code, sorry.
As I can test macOS (Sierra) only, I would like to see Windows and Linux approvals, too

review: Approve (compile, test)

[kaputtnik (franku)]

One little thing: If the dropdown box is once opened and closed (with moving away the mouse pointer) and hitting the down arrow of the keyboard, the dropdownmenu sometimes pops up for little time. Best to see if you keep the down arrow down for a longer time.

Not really an issue, so i leave it up to you to fix this.

[GunChleoc (gunchleoc)]

Good point - deactivated the key when the mouse is not on the dropdown.

[kaputtnik (franku)]

Great :-)

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1382. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/164389381.
Appveyor build 1224. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1224.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1384. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/164458580.
Appveyor build 1226. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1226.

[Klaus Halfmann (klaus-halfmann)]

After merging the trunk I now get (in bzr8108[bug-536489-dropdown])

Spieldatenfehler
economies: player 3: Stream ended unexpectedly (0 bytes read, 4 expected)

So I was unable to continue playing my last save game.
As this happens in trunk to I will not complain more ...

[GunChleoc (gunchleoc)]

That error can't possibly be related to this branch, since you already said that it happens in trunk as well. It's worth reporting as a bug though.

[SirVer (sirver)]

Just tested under Mac OS. Really nice change. One possible eye candy nit/improvement could be a small line outside of the drop down at the bottom and the sides - to connect the drop down better with the original button.

I will review the code eventually.... no hurry here, build 19 is still a few weeks off.

[kaputtnik (franku)]

> One possible eye candy
> nit/improvement could be a small line outside of the drop down at the bottom
> and the sides - to connect the drop down better with the original button.

+1 (i thought something like this also)

[GunChleoc (gunchleoc)]

Beautification done :)

I also want to give the scrollbar some love, but I'll have to do that in a separate branch, since that will affect all kinds of stuff.

[kaputtnik (franku)]

Looks better now. Have you tested showing it flattened instead of raised?

[GunChleoc (gunchleoc)]

No, I think flattened is wrong for it - it is dropped down on top of the other elements, not below them.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1445. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/170387162.
Appveyor build 1288. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1288.

[SirVer (sirver)]

A couple of change suggestions and questions in code

review: Needs Fixing

[GunChleoc (gunchleoc)]

Added some replies/questions.

[SirVer (sirver)]

you also need to merge trunk it seems.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1527. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/171318976.
Appveyor build 1288. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1288.

[GunChleoc (gunchleoc)]

All fixed except for 1 comment - have added a comment on my own to the source code.

review: Needs Resubmitting

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1531. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/171467686.
Appveyor build 1373. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_536489_dropdown-1373.

[SirVer (sirver)]

I added a inline comment there. Essentially, I still think it is worthwhile for clarity to pull this function out.

otherwise lgtm.

review: Approve

[GunChleoc (gunchleoc)]

You are right, it makes the function easier to read, so I've pulled it out.
Thanks for the review :)

@bunnybot merge

=== modified file 'src/editor/ui_menus/main_menu_map_options.cc'
--- src/editor/ui_menus/main_menu_map_options.cc	2016-10-16 09:31:42 +0000
+++ src/editor/ui_menus/main_menu_map_options.cc	2016-10-29 10:23:37 +0000
@@ -79,7 +79,7 @@
      author_(&main_box_, 0, 0, max_w_, 0, 2, g_gr->images().get("images/ui_basic/but1.png")),
      size_(&main_box_, 0, 0, max_w_ - indent_, labelh_, ""),
 
-     teams_list_(&teams_box_, 0, 0, max_w_, 60, true),
+     teams_list_(&teams_box_, 0, 0, max_w_, 60, UI::ListselectLayout::kShowCheck),
 
      modal_(modal) {
 
 
=== modified file 'src/ui_basic/CMakeLists.txt'
--- src/ui_basic/CMakeLists.txt	2016-04-02 16:45:53 +0000
+++ src/ui_basic/CMakeLists.txt	2016-10-29 10:23:37 +0000
@@ -6,6 +6,8 @@
     button.h
     checkbox.cc
     checkbox.h
+    dropdown.cc
+    dropdown.h
     editbox.cc
     editbox.h
     fileview_panel.cc
 
=== modified file 'src/ui_basic/button.cc'
--- src/ui_basic/button.cc	2016-10-24 14:04:00 +0000
+++ src/ui_basic/button.cc	2016-10-29 10:23:37 +0000
@@ -65,6 +65,7 @@
 		set_size(w, new_height);
 	}
 	set_thinks(false);
+	set_can_focus(true);
 }
 
 Button::Button  //  for pictorial buttons
@@ -91,6 +92,7 @@
      pic_custom_(fg_pic),
      clr_down_(229, 161, 2) {
 	set_thinks(false);
+	set_can_focus(true);
 }
 
 Button::~Button() {
@@ -127,6 +129,8 @@
 	if (enabled_ == on)
 		return;
 
+	set_can_focus(on);
+
 	// disabled buttons should look different...
 	if (on)
 		enabled_ = true;
@@ -148,7 +152,8 @@
 	// Draw the background
 	if (pic_background_) {
 		dst.fill_rect(Rectf(0.f, 0.f, get_w(), get_h()), RGBAColor(0, 0, 0, 255));
-		dst.tile(Recti(Vector2i(0, 0), get_w(), get_h()), pic_background_, Vector2i(get_x(), get_y()));
+		dst.tile(
+		   Recti(Vector2i(0, 0), get_w(), get_h()), pic_background_, Vector2i(get_x(), get_y()));
 	}
 
 	if (enabled_ && highlighted_ && style_ != Style::kFlat)
@@ -198,8 +203,8 @@
 		                   enabled_ ? UI_FONT_CLR_FG : UI_FONT_CLR_DISABLED);
 		// Blit on pixel boundary (not float), so that the text is blitted pixel perfect.
 		dst.blit(
-			Vector2f((get_w() - entry_text_im->width()) / 2, (get_h() - entry_text_im->height()) / 2),
-			entry_text_im);
+		   Vector2f((get_w() - entry_text_im->width()) / 2, (get_h() - entry_text_im->height()) / 2),
+		   entry_text_im);
 	}
 
 	//  draw border
@@ -294,6 +299,7 @@
 		return false;
 
 	if (enabled_) {
+		focus();
 		grab_mouse(true);
 		pressed_ = true;
 		if (repeating_) {
 
=== modified file 'src/ui_basic/button.h'
--- src/ui_basic/button.h	2016-09-25 13:07:06 +0000
+++ src/ui_basic/button.h	2016-10-29 10:23:37 +0000
@@ -39,7 +39,7 @@
 	enum class Style {
 		kRaised,       // Normal raised Button
 		kPermpressed,  // Button will appear pressed
-		kFlat         // Flat button with simple coloured outline
+		kFlat          // Flat button with simple coloured outline
 	};
 
 	enum class ImageMode {
@@ -108,7 +108,6 @@
 	/// Convenience function. If 'pressed', sets the style to kPermpressed, otherwise to kRaised.
 	void set_perm_pressed(bool pressed);
 
-
 	/// Convenience function. Toggles between raised and permpressed style
 	void toggle();
 
 
=== modified file 'src/ui_basic/checkbox.cc'
--- src/ui_basic/checkbox.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/checkbox.cc	2016-10-29 10:23:37 +0000
@@ -43,7 +43,7 @@
 	uint16_t h = pic->height();
 	set_desired_size(w, h);
 	set_size(w, h);
-
+	set_can_focus(true);
 	set_flags(Has_Custom_Picture, true);
 	pic_graphics_ = pic;
 }
@@ -79,6 +79,7 @@
  * Args: enabled  true if the checkbox should be enabled, false otherwise
  */
 void Statebox::set_enabled(bool const enabled) {
+	set_can_focus(enabled);
 	if (((flags_ & Is_Enabled) > 1) && enabled)
 		return;
 
@@ -157,6 +158,7 @@
  */
 bool Statebox::handle_mousepress(const uint8_t btn, int32_t, int32_t) {
 	if (btn == SDL_BUTTON_LEFT && (flags_ & Is_Enabled)) {
+		focus();
 		clicked();
 		return true;
 	}
 
=== added file 'src/ui_basic/dropdown.cc'
--- src/ui_basic/dropdown.cc	1970-01-01 00:00:00 +0000
+++ src/ui_basic/dropdown.cc	2016-10-29 10:23:37 +0000
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include "ui_basic/dropdown.h"
+
+#include <algorithm>
+
+#include <boost/format.hpp>
+
+#include "base/i18n.h"
+#include "graphic/align.h"
+#include "graphic/font_handler1.h"
+#include "graphic/graphic.h"
+#include "graphic/image.h"
+#include "graphic/rendertarget.h"
+#include "ui_basic/mouse_constants.h"
+
+namespace UI {
+
+BaseDropdown::BaseDropdown(
+   UI::Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, const std::string& label)
+   : UI::Panel(
+        parent,
+        x,
+        y,
+        w,
+        std::max(24,
+                 UI::g_fh1->render(as_uifont(UI::g_fh1->fontset()->representative_character()))
+                       ->height() +
+                    2)),  // Height only to fit the button, so we can use this in Box layout.
+     max_list_height_(h - 2 * get_h()),
+     mouse_tolerance_(50),
+     button_box_(this, 0, 0, UI::Box::Horizontal, w, h),
+     push_button_(&button_box_,
+                  "dropdown_select",
+                  0,
+                  0,
+                  24,
+                  get_h(),
+                  g_gr->images().get("images/ui_basic/but3.png"),
+                  g_gr->images().get("images/ui_basic/scrollbar_down.png"),
+                  pgettext("dropdown", "Select Item")),
+     display_button_(&button_box_,
+                     "dropdown_label",
+                     0,
+                     0,
+                     w - 24,
+                     get_h(),
+                     g_gr->images().get("images/ui_basic/but1.png"),
+                     label),
+     // Hook into parent so we can drop down outside the panel
+     list_(parent, x, y + get_h(), w, 0, ListselectLayout::kDropdown),
+     label_(label) {
+	list_.set_visible(false);
+	list_.set_background(g_gr->images().get("images/ui_basic/but1.png"));
+	display_button_.set_perm_pressed(true);
+	button_box_.add(&display_button_, UI::Align::kLeft);
+	button_box_.add(&push_button_, UI::Align::kLeft);
+	button_box_.set_size(w, get_h());
+
+	display_button_.sigclicked.connect(boost::bind(&BaseDropdown::toggle_list, this));
+	push_button_.sigclicked.connect(boost::bind(&BaseDropdown::toggle_list, this));
+	list_.clicked.connect(boost::bind(&BaseDropdown::set_value, this));
+	list_.clicked.connect(boost::bind(&BaseDropdown::toggle_list, this));
+	set_can_focus(true);
+}
+
+BaseDropdown::~BaseDropdown() {
+	clear();
+}
+
+void BaseDropdown::add(const std::string& name,
+                       const uint32_t value,
+                       const Image* pic,
+                       const bool select_this,
+                       const std::string& tooltip_text) {
+	list_.set_size(
+	   list_.get_w(), std::min(list_.get_h() + list_.get_lineheight(), max_list_height_));
+	list_.add(name, value, pic, select_this, tooltip_text);
+	if (select_this) {
+		set_value();
+	}
+}
+
+bool BaseDropdown::has_selection() const {
+	return list_.has_selection();
+}
+
+uint32_t BaseDropdown::get_selected() const {
+	return list_.get_selected();
+}
+
+void BaseDropdown::set_label(const std::string& text) {
+	label_ = text;
+	display_button_.set_title(label_);
+}
+
+void BaseDropdown::set_tooltip(const std::string& text) {
+	tooltip_ = text;
+	display_button_.set_tooltip(tooltip_);
+}
+
+void BaseDropdown::set_enabled(bool on) {
+	set_can_focus(on);
+	push_button_.set_enabled(on);
+	push_button_.set_tooltip(on ? pgettext("dropdown", "Select Item") : "");
+	display_button_.set_enabled(on);
+	list_.set_visible(false);
+}
+
+void BaseDropdown::set_pos(Vector2i point) {
+	UI::Panel::set_pos(point);
+	list_.set_pos(Vector2i(point.x, point.y + get_h()));
+}
+
+void BaseDropdown::clear() {
+	list_.clear();
+	list_.set_size(list_.get_w(), 0);
+	set_layout_toplevel(false);
+}
+
+void BaseDropdown::think() {
+	if (list_.is_visible()) {
+		// Autocollapse with a bit of tolerance for the mouse movement to make it less fiddly.
+		if (!(has_focus() || list_.has_focus()) || is_mouse_away()) {
+			toggle_list();
+		}
+	}
+}
+
+uint32_t BaseDropdown::size() const {
+	return list_.size();
+}
+
+void BaseDropdown::set_value() {
+	const std::string name = list_.has_selection() ? list_.get_selected_name() :
+	                                                 /** TRANSLATORS: Selection in Dropdown menus. */
+	                            pgettext("dropdown", "Not Selected");
+
+	if (label_.empty()) {
+		display_button_.set_title(name);
+	} else {
+		/** TRANSLATORS: Label: Value. */
+		display_button_.set_title((boost::format(_("%1%: %2%")) % label_ % (name)).str());
+	}
+	display_button_.set_tooltip(list_.has_selection() ? list_.get_selected_tooltip() : tooltip_);
+	selected();
+	current_selection_ = list_.selection_index();
+}
+
+void BaseDropdown::toggle_list() {
+	list_.set_visible(!list_.is_visible());
+	if (list_.is_visible()) {
+		list_.move_to_top();
+		focus();
+	}
+	// Make sure that the list covers and deactivates the elements below it
+	set_layout_toplevel(list_.is_visible());
+}
+
+bool BaseDropdown::is_mouse_away() const {
+	return (get_mouse_position().x + mouse_tolerance_) < 0 ||
+	       get_mouse_position().x > (get_w() + mouse_tolerance_) ||
+	       (get_mouse_position().y + mouse_tolerance_ / 2) < 0 ||
+	       get_mouse_position().y > (get_h() + list_.get_h() + mouse_tolerance_);
+}
+
+bool BaseDropdown::handle_key(bool down, SDL_Keysym code) {
+	if (down) {
+		switch (code.sym) {
+		case SDLK_KP_ENTER:
+		case SDLK_RETURN:
+			if (list_.is_visible()) {
+				set_value();
+			}
+		case SDLK_ESCAPE:
+			if (list_.is_visible()) {
+				list_.select(current_selection_);
+				toggle_list();
+				return true;
+			}
+			break;
+		case SDLK_DOWN:
+			if (!list_.is_visible() && !is_mouse_away()) {
+				toggle_list();
+				return true;
+			}
+			break;
+		default:
+			break;  // not handled
+		}
+	}
+	if (list_.is_visible()) {
+		return list_.handle_key(down, code);
+	}
+	return false;
+}
+
+}  // namespace UI
 
=== added file 'src/ui_basic/dropdown.h'
--- src/ui_basic/dropdown.h	1970-01-01 00:00:00 +0000
+++ src/ui_basic/dropdown.h	2016-10-29 10:23:37 +0000
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2016 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_UI_BASIC_DROPDOWN_H
+#define WL_UI_BASIC_DROPDOWN_H
+
+#include <deque>
+#include <memory>
+
+#include <boost/signals2.hpp>
+
+#include "ui_basic/box.h"
+#include "ui_basic/button.h"
+#include "ui_basic/listselect.h"
+#include "ui_basic/panel.h"
+
+namespace UI {
+
+/// Implementation for a dropdown menu that lets the user select a value.
+class BaseDropdown : public Panel {
+protected:
+	/// \param parent     the parent panel
+	/// \param x          the x-position within 'parent'
+	/// \param y          the y-position within 'parent'
+	/// \param w          the dropdown's width
+	/// \param h          the maximum height for the dropdown list
+	/// \param label      a label to prefix to the selected entry on the display button.
+	BaseDropdown(
+	   Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, const std::string& label);
+	~BaseDropdown();
+
+public:
+	boost::signals2::signal<void()> selected;
+
+	/// \return true if an element has been selected from the list
+	bool has_selection() const;
+
+	/// Sets a label that will be prefixed to the currently selected element's name
+	/// and displayed on the display button.
+	void set_label(const std::string& text);
+
+	/// Sets the tooltip for the display button.
+	void set_tooltip(const std::string& text);
+
+	/// Enables/disables the dropdown selection.
+	void set_enabled(bool on);
+
+	/// Move the dropdown. The dropdown's position is relative to the parent in
+	/// pixels.
+	void set_pos(Vector2i point) override;
+
+	/// The number of elements listed in the dropdown.
+	uint32_t size() const;
+
+	/// Handle keypresses
+	bool handle_key(bool down, SDL_Keysym code) override;
+
+protected:
+	/// Add an element to the list
+	/// \param name         the display name of the entry
+	/// \param value        the index of the entry
+	/// \param pic          an image to illustrate the entry
+	/// \param select_this  whether this element should be selected
+	/// \param tooltip_text a tooltip for this entry
+	void add(const std::string& name,
+	         uint32_t value,
+	         const Image* pic = nullptr,
+	         const bool select_this = false,
+	         const std::string& tooltip_text = std::string());
+
+	/// \return the index of the selected element
+	uint32_t get_selected() const;
+
+	/// Removes all elements from the list.
+	void clear();
+
+	/// Automatically collapses the list if the mouse gets too far away from the dropdown, or if it
+	/// loses focus.
+	void think() override;
+
+private:
+	/// Updates the title and tooltip of the display button and triggers a 'selected' signal.
+	void set_value();
+	/// Toggles the dropdown list on and off.
+	void toggle_list();
+
+	/// Returns true if the mouse pointer left the vicinity of the dropdown.
+	bool is_mouse_away() const;
+
+	uint32_t max_list_height_;
+	const int mouse_tolerance_;  // Allow mouse outside the panel a bit before autocollapse
+	UI::Box button_box_;
+	UI::Button push_button_;
+	UI::Button display_button_;
+	UI::Listselect<uintptr_t> list_;
+	std::string label_;
+	std::string tooltip_;
+	uint32_t current_selection_;
+};
+
+/// A dropdown menu that lets the user select a value of the datatype 'Entry'.
+template <typename Entry> class Dropdown : public BaseDropdown {
+public:
+	/// \param parent     the parent panel
+	/// \param x          the x-position within 'parent'
+	/// \param y          the y-position within 'parent'
+	/// \param w          the dropdown's width
+	/// \param h          the maximum height for the dropdown list
+	/// \param label      a label to prefix to the selected entry on the display button.
+	///                   entry.
+	Dropdown(Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, const std::string& label)
+	   : BaseDropdown(parent, x, y, w, h, label) {
+	}
+	~Dropdown() {
+		clear();
+	}
+
+	/// Add an element to the list
+	/// \param name         the display name of the entry
+	/// \param value        the value for the entry
+	/// \param pic          an image to illustrate the entry
+	/// \param select_this  whether this element should be selected
+	/// \param tooltip_text a tooltip for this entry
+	void add(const std::string& name,
+	         Entry value,
+	         const Image* pic = nullptr,
+	         const bool select_this = false,
+	         const std::string& tooltip_text = std::string()) {
+		entry_cache_.push_back(std::unique_ptr<Entry>(new Entry(value)));
+		BaseDropdown::add(name, size(), pic, select_this, tooltip_text);
+	}
+
+	/// \return the selected element
+	const Entry& get_selected() const {
+		return *entry_cache_[BaseDropdown::get_selected()];
+	}
+
+	/// Removes all elements from the list.
+	void clear() {
+		BaseDropdown::clear();
+	}
+
+private:
+	// Contains the actual elements. The BaseDropdown registers the indices only.
+	std::deque<std::unique_ptr<Entry>> entry_cache_;
+};
+
+}  // namespace UI
+
+#endif  // end of include guard: WL_UI_BASIC_DROPDOWN_H
 
=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/listselect.cc	2016-10-29 10:23:37 +0000
@@ -31,6 +31,7 @@
 #include "graphic/text/bidi.h"
 #include "graphic/text_constants.h"
 #include "graphic/text_layout.h"
+#include "ui_basic/mouse_constants.h"
 #include "wlapplication.h"
 
 constexpr int kMargin = 2;
@@ -46,11 +47,11 @@
  *       h
 */
 BaseListselect::BaseListselect(Panel* const parent,
-                               int32_t const x,
-                               int32_t const y,
-                               uint32_t const w,
-                               uint32_t const h,
-                               bool const show_check)
+                               const int32_t x,
+                               const int32_t y,
+                               const uint32_t w,
+                               const uint32_t h,
+                               const ListselectLayout selection_mode)
    : Panel(parent, x, y, w, h),
      lineheight_(
         UI::g_fh1->render(as_uifont(UI::g_fh1->fontset()->representative_character()))->height() +
@@ -60,7 +61,8 @@
      selection_(no_selection_index()),
      last_click_time_(-10000),
      last_selection_(no_selection_index()),
-     show_check_(show_check) {
+     selection_mode_(selection_mode),
+     background_(nullptr) {
 	set_thinks(false);
 
 	scrollbar_.moved.connect(boost::bind(&BaseListselect::set_scrollpos, this, _1));
@@ -68,7 +70,7 @@
 	scrollbar_.set_pagesize(h - 2 * lineheight_);
 	scrollbar_.set_steps(1);
 
-	if (show_check) {
+	if (selection_mode_ == ListselectLayout::kShowCheck) {
 		uint32_t pic_h;
 		check_pic_ = g_gr->images().get("images/ui_basic/list_selected.png");
 		max_pic_width_ = check_pic_->width();
@@ -252,7 +254,7 @@
 	if (selection_ == i)
 		return;
 
-	if (show_check_) {
+	if (selection_mode_ == ListselectLayout::kShowCheck) {
 		if (selection_ != no_selection_index())
 			entry_records_[selection_]->pic = nullptr;
 		entry_records_[i]->pic = check_pic_;
@@ -274,26 +276,37 @@
  * \return the ID/entry value of the currently selected item.
  * The entry value is given as a parameter to \ref add
  *
- * Throws an exception when no item is selected.
+ * Returns no_selection_index() if no item has been selected.
  */
 uint32_t BaseListselect::get_selected() const {
-	if (selection_ == no_selection_index())
-		throw NoSelection();
-
-	return entry_records_[selection_]->entry_;
+	return selection_ < entry_records_.size() ? entry_records_[selection_]->entry_ :
+	                                            no_selection_index();
 }
 
 /**
- * Remove the currently selected item. Throws an exception when no
- * item is selected.
+ * Remove the currently selected item. Requires an element to have been selected first.
  */
 void BaseListselect::remove_selected() {
-	if (selection_ == no_selection_index())
-		throw NoSelection();
-
+	assert(selection_ != no_selection_index());
 	remove(selection_);
 }
 
+/**
+ * \return The name of the currently selected entry. Requires an entry to have been selected.
+ */
+const std::string& BaseListselect::get_selected_name() const {
+	assert(selection_ < entry_records_.size());
+	return entry_records_[selection_]->name;
+}
+
+/**
+ * \return The tooltip for the currently selected entry. Requires an entry to have been selected.
+ */
+const std::string& BaseListselect::get_selected_tooltip() const {
+	assert(selection_ < entry_records_.size());
+	return entry_records_[selection_]->tooltip;
+}
+
 uint32_t BaseListselect::get_lineheight() const {
 	return lineheight_ + kMargin;
 }
@@ -302,27 +315,56 @@
 	return scrollbar_.is_enabled() ? get_w() - scrollbar_.get_w() : get_w();
 }
 
+void BaseListselect::layout() {
+	scrollbar_.set_size(scrollbar_.get_w(), get_h());
+	scrollbar_.set_pagesize(get_h() - 2 * get_lineheight());
+	scrollbar_.set_steps(entry_records_.size() * get_lineheight() - get_h());
+}
+
 /**
 Redraw the listselect box
 */
 void BaseListselect::draw(RenderTarget& dst) {
 	// draw text lines
-	const uint32_t lineheight = get_lineheight();
-	uint32_t idx = scrollpos_ / lineheight;
-	float y = 1 + idx * lineheight - scrollpos_;
-
-	dst.brighten_rect(Rectf(0.f, 0.f, get_w(), get_h()), ms_darken_value);
-
+	const int eff_h =
+	   selection_mode_ == ListselectLayout::kDropdown ? get_inner_h() - 4 : get_inner_h();
+	uint32_t idx = scrollpos_ / get_lineheight();
+	int y = 1 + idx * get_lineheight() - scrollpos_;
+
+	if (background_ != nullptr) {
+		dst.tile(Recti(Vector2i(0, 0), get_w(), get_h()), background_, Vector2i(0, 0));
+	}
+
+	if (selection_mode_ == ListselectLayout::kDropdown) {
+		RGBAColor black(0, 0, 0, 255);
+		//  left edge
+		dst.brighten_rect(Rectf(0.f, 0.f, 2.f, get_h()), BUTTON_EDGE_BRIGHT_FACTOR);
+		//  bottom edge
+		dst.fill_rect(Rectf(2.f, get_h() - 2.f, get_eff_w() - 2.f, 1.f), black);
+		dst.fill_rect(Rectf(1.f, get_h() - 1.f, get_eff_w() - 1.f, 1.f), black);
+		//  right edge
+		dst.fill_rect(Rectf(get_w() - 2.f, 1.f, 1.f, get_h() - 1.f), black);
+		dst.fill_rect(Rectf(get_w() - 1.f, 0.f, 1.f, get_h()), black);
+	} else {
+		dst.brighten_rect(Rectf(0.f, 0.f, get_w(), get_h()), ms_darken_value);
+	}
+
+	int lineheight = lineheight_;
 	while (idx < entry_records_.size()) {
-		assert(get_h() < std::numeric_limits<int32_t>::max());
-		if (y >= get_h()) {
+		assert(eff_h < std::numeric_limits<int32_t>::max());
+
+		// Don't draw over the bottom edge
+		lineheight = std::min(eff_h - y, lineheight);
+		if (lineheight < 0) {
 			break;
 		}
 
 		const EntryRecord& er = *entry_records_[idx];
 
-		Vector2f point(1.f, y);
-		uint32_t maxw = get_eff_w() - 2;
+		Vector2f point(selection_mode_ == ListselectLayout::kDropdown ? 3.f : 1.f, y);
+		uint32_t maxw =
+		   get_eff_w() -
+		   (selection_mode_ == ListselectLayout::kDropdown ? scrollbar_.is_enabled() ? 4 : 5 : 2);
 
 		// Highlight the current selected entry
 		if (idx == selection_) {
@@ -347,7 +389,7 @@
 		// Now draw pictures
 		if (er.pic) {
 			dst.blit(Vector2f(UI::g_fh1->fontset()->is_rtl() ? get_eff_w() - er.pic->width() - 1 : 1,
-			                  y + (get_lineheight() - er.pic->height()) / 2.f),
+			                  y + (lineheight_ - er.pic->height()) / 2),
 			         er.pic);
 		}
 
@@ -368,12 +410,18 @@
 		}
 
 		// Fix vertical position for mixed font heights
-		if (get_lineheight() > static_cast<uint32_t>(entry_text_im->height())) {
+		if (lineheight_ > static_cast<uint32_t>(entry_text_im->height())) {
 			point.y += (lineheight_ - entry_text_im->height()) / 2;
 		} else {
 			point.y -= (entry_text_im->height() - lineheight_) / 2;
 		}
 
+		// Don't draw over the bottom edge
+		lineheight = std::min(eff_h - static_cast<int>(point.y), lineheight);
+		if (lineheight < 0) {
+			break;
+		}
+
 		// Crop to column width while blitting
 		if (static_cast<int>(alignment & UI::Align::kRight) &&
 		    (maxw + picw) < static_cast<uint32_t>(entry_text_im->width())) {
@@ -382,13 +430,13 @@
 
 			// We want this always on, e.g. for mixed language savegame filenames, or the languages
 			// list
-			dst.blitrect(point, entry_text_im,
-			             Recti(entry_text_im->width() - maxw + picw, 0, maxw, entry_text_im->height()));
+			dst.blitrect(point, entry_text_im, Recti(entry_text_im->width() - maxw + picw, 0, maxw,
+			                                         entry_text_im->height()));
 		} else {
-			dst.blitrect(point, entry_text_im, Recti(0, 0, maxw, entry_text_im->height()));
+			dst.blitrect(point, entry_text_im, Recti(0, 0, maxw, lineheight));
 		}
 
-		y += lineheight;
+		y += get_lineheight();
 		++idx;
 	}
 }
@@ -445,6 +493,9 @@
 		set_tooltip("");
 		return false;
 	}
+	if (selection_mode_ == ListselectLayout::kDropdown) {
+		select(y);
+	}
 	set_tooltip(entry_records_.at(y)->tooltip);
 	return true;
 }
 
=== modified file 'src/ui_basic/listselect.h'
--- src/ui_basic/listselect.h	2016-08-04 15:49:05 +0000
+++ src/ui_basic/listselect.h	2016-10-29 10:23:37 +0000
@@ -32,6 +32,12 @@
 namespace UI {
 struct Scrollbar;
 
+enum class ListselectLayout {
+	kPlain,     // Highlight the selected element
+	kDropdown,  // When the mouse moves, instantly select the element that the mouse hovers over
+	kShowCheck  // Show a green arrow in front of the selected element
+};
+
 /**
  * This class defines a list-select box whose entries are defined by a name
  * and an associated numeric ID.
@@ -39,8 +45,12 @@
  * Use the \ref Listselect template to use arbitrary IDs.
  */
 struct BaseListselect : public Panel {
-	BaseListselect(
-	   Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, bool show_check = false);
+	BaseListselect(Panel* parent,
+	               int32_t x,
+	               int32_t y,
+	               uint32_t w,
+	               uint32_t h,
+	               ListselectLayout selection_mode = ListselectLayout::kPlain);
 	~BaseListselect();
 
 	boost::signals2::signal<void(uint32_t)> selected;
@@ -88,15 +98,23 @@
 	void select(uint32_t i);
 	bool has_selection() const;
 
-	struct NoSelection {};
 	uint32_t get_selected() const;
 	void remove_selected();
 
+	const std::string& get_selected_name() const;
+	const std::string& get_selected_tooltip() const;
+
+	void set_background(const Image* background) {
+		background_ = background;
+	}
+
 	///  Return the total height (text + spacing) occupied by a single line.
 	uint32_t get_lineheight() const;
 
 	uint32_t get_eff_w() const;
 
+	void layout() override;
+
 	// Drawing and event handling
 	void draw(RenderTarget&) override;
 	bool handle_mousepress(uint8_t btn, int32_t x, int32_t y) override;
@@ -132,14 +150,20 @@
 	uint32_t selection_;
 	uint32_t last_click_time_;
 	uint32_t last_selection_;  // for double clicks
-	bool show_check_;          //  show a green arrow left of selected element
+	ListselectLayout selection_mode_;
 	const Image* check_pic_;
+	const Image* background_;
 	std::string current_tooltip_;
 };
 
 template <typename Entry> struct Listselect : public BaseListselect {
-	Listselect(Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, bool show_check = false)
-	   : BaseListselect(parent, x, y, w, h, show_check) {
+	Listselect(Panel* parent,
+	           int32_t x,
+	           int32_t y,
+	           uint32_t w,
+	           uint32_t h,
+	           ListselectLayout selection_mode = ListselectLayout::kPlain)
+	   : BaseListselect(parent, x, y, w, h, selection_mode) {
 	}
 
 	void add(const std::string& name,
@@ -167,6 +191,10 @@
 		return entry_cache_[BaseListselect::get_selected()];
 	}
 
+	void set_background(const Image* background) {
+		BaseListselect::set_background(background);
+	}
+
 private:
 	std::deque<Entry> entry_cache_;
 };
@@ -181,8 +209,13 @@
 template <typename Entry> struct Listselect<Entry&> : public Listselect<Entry*> {
 	using Base = Listselect<Entry*>;
 
-	Listselect(Panel* parent, int32_t x, int32_t y, uint32_t w, uint32_t h, bool show_check = false)
-	   : Base(parent, x, y, w, h, show_check) {
+	Listselect(Panel* parent,
+	           int32_t x,
+	           int32_t y,
+	           uint32_t w,
+	           uint32_t h,
+	           ListselectLayout selection_mode = ListselectLayout::kPlain)
+	   : Base(parent, x, y, w, h, selection_mode) {
 	}
 
 	void add(const std::string& name,
@@ -207,6 +240,10 @@
 	Entry& get_selected() const {
 		return *Base::get_selected();
 	}
+
+	void set_background(const Image* background) {
+		*Base::set_background(background);
+	}
 };
 }
 
 
=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/panel.cc	2016-10-29 10:23:37 +0000
@@ -820,7 +820,7 @@
 		// Found a child at the position
 		if (child->do_mousewheel(
 		       which, x, y, rel_mouse_pos - Vector2i(child->get_x() + child->get_lborder(),
-		                                          child->get_y() + child->get_tborder()))) {
+		                                             child->get_y() + child->get_tborder()))) {
 			return true;
 		}
 		// Break after the first hit panel in the list. The panels are ordered from top to bottom,
 
=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2016-10-16 09:31:42 +0000
+++ src/ui_basic/panel.h	2016-10-29 10:23:37 +0000
@@ -113,7 +113,7 @@
 	// Geometry
 	void set_size(int nw, int nh);
 	void set_desired_size(int w, int h);
-	void set_pos(Vector2i);
+	virtual void set_pos(Vector2i);
 	virtual void move_inside_parent();
 	virtual void layout();
 
 
=== modified file 'src/ui_basic/progressbar.cc'
--- src/ui_basic/progressbar.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/progressbar.cc	2016-10-29 10:23:37 +0000
@@ -67,8 +67,8 @@
 	assert(fraction <= 1);
 
 	const RGBColor color = fraction <= 0.33f ? RGBColor(255, 0, 0) : fraction <= 0.67f ?
-	                                          RGBColor(255, 255, 0) :
-	                                          RGBColor(0, 255, 0);
+	                                           RGBColor(255, 255, 0) :
+	                                           RGBColor(0, 255, 0);
 
 	// Draw the actual bar
 	if (orientation_ == Horizontal) {
 
=== modified file 'src/ui_basic/scrollbar.cc'
--- src/ui_basic/scrollbar.cc	2016-10-23 12:59:11 +0000
+++ src/ui_basic/scrollbar.cc	2016-10-29 10:23:37 +0000
@@ -271,7 +271,8 @@
 		dst.fill_rect(Rectf(r.origin() + Vector2f(r.w - 1, 1), 1, r.h - 1), black);
 	} else {
 		// bottom edge
-		dst.brighten_rect(Rectf(r.origin() + Vector2f(0, r.h - 2), r.w, 2), BUTTON_EDGE_BRIGHT_FACTOR);
+		dst.brighten_rect(
+		   Rectf(r.origin() + Vector2f(0, r.h - 2), r.w, 2), BUTTON_EDGE_BRIGHT_FACTOR);
 		// right edge
 		dst.brighten_rect(
 		   Rectf(r.origin() + Vector2f(r.w - 2, 0), 2, r.h - 2), BUTTON_EDGE_BRIGHT_FACTOR);
 
=== modified file 'src/ui_basic/slider.cc'
--- src/ui_basic/slider.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/slider.cc	2016-10-29 10:23:37 +0000
@@ -75,6 +75,7 @@
      bar_size_(bar_size),
      cursor_size_(cursor_size) {
 	set_thinks(false);
+	set_can_focus(true);
 	calculate_cursor_position();
 }
 
@@ -200,6 +201,7 @@
 	if (enabled_ == enabled)
 		return;
 
+	set_can_focus(enabled);
 	enabled_ = enabled;
 	if (!enabled) {
 		pressed_ = false;
@@ -399,6 +401,7 @@
 	if (btn != SDL_BUTTON_LEFT)
 		return false;
 
+	focus();
 	if (x >= cursor_pos_ && x <= cursor_pos_ + cursor_size_) {
 		//  click on cursor
 		cursor_pressed(x);
@@ -469,6 +472,7 @@
 	if (btn != SDL_BUTTON_LEFT)
 		return false;
 
+	focus();
 	if (y >= cursor_pos_ && y <= cursor_pos_ + cursor_size_) {
 		//  click on cursor
 		cursor_pressed(y);
 
=== modified file 'src/ui_basic/tabpanel.cc'
--- src/ui_basic/tabpanel.cc	2016-10-16 20:35:47 +0000
+++ src/ui_basic/tabpanel.cc	2016-10-29 10:23:37 +0000
@@ -260,13 +260,13 @@
 	if (pic_background_) {
 		if (!tabs_.empty()) {
 			dst.tile(Recti(Vector2i(0, 0), tabs_.back()->get_x() + tabs_.back()->get_w(),
-			              kTabPanelButtonHeight - 2),
+			               kTabPanelButtonHeight - 2),
 			         pic_background_, Vector2i(get_x(), get_y()));
 		}
 		assert(kTabPanelButtonHeight - 2 <= get_h());
-		dst.tile(
-		   Recti(Vector2i(0, kTabPanelButtonHeight - 2), get_w(), get_h() - kTabPanelButtonHeight + 2),
-		   pic_background_, Vector2i(get_x(), get_y() + kTabPanelButtonHeight - 2));
+		dst.tile(Recti(Vector2i(0, kTabPanelButtonHeight - 2), get_w(),
+		               get_h() - kTabPanelButtonHeight + 2),
+		         pic_background_, Vector2i(get_x(), get_y() + kTabPanelButtonHeight - 2));
 	}
 
 	RGBColor black(0, 0, 0);
@@ -279,8 +279,7 @@
 		tab_width = tabs_[idx]->get_w();
 
 		if (highlight_ == idx) {
-			dst.brighten_rect(
-			   Rectf(x, 0, tab_width, kTabPanelButtonHeight), MOUSE_OVER_BRIGHT_FACTOR);
+			dst.brighten_rect(Rectf(x, 0, tab_width, kTabPanelButtonHeight), MOUSE_OVER_BRIGHT_FACTOR);
 		}
 
 		assert(tabs_[idx]->pic);
@@ -297,13 +296,13 @@
 			uint16_t picture_height = image_scale * tabs_[idx]->pic->height();
 			dst.blitrect_scale(
 			   Rectf(x + (kTabPanelButtonHeight - picture_width) / 2.f,
-			        (kTabPanelButtonHeight - picture_height) / 2.f, picture_width, picture_height),
+			         (kTabPanelButtonHeight - picture_height) / 2.f, picture_width, picture_height),
 			   tabs_[idx]->pic, Recti(0, 0, tabs_[idx]->pic->width(), tabs_[idx]->pic->height()), 1.,
 			   BlendMode::UseAlpha);
 		} else {
-			dst.blit(
-			   Vector2f(x + kTabPanelTextMargin, (kTabPanelButtonHeight - tabs_[idx]->pic->height()) / 2.f),
-			   tabs_[idx]->pic, BlendMode::UseAlpha, UI::Align::kLeft);
+			dst.blit(Vector2f(x + kTabPanelTextMargin,
+			                  (kTabPanelButtonHeight - tabs_[idx]->pic->height()) / 2.f),
+			         tabs_[idx]->pic, BlendMode::UseAlpha, UI::Align::kLeft);
 		}
 
 		// Draw top part of border
@@ -317,8 +316,7 @@
 			dst.brighten_rect(
 			   Rectf(x, kTabPanelButtonHeight - 2, tab_width, 2), 2 * BUTTON_EDGE_BRIGHT_FACTOR);
 		else {
-			dst.brighten_rect(
-			   Rectf(x, kTabPanelButtonHeight - 2, 2, 2), BUTTON_EDGE_BRIGHT_FACTOR);
+			dst.brighten_rect(Rectf(x, kTabPanelButtonHeight - 2, 2, 2), BUTTON_EDGE_BRIGHT_FACTOR);
 
 			dst.brighten_rect(Rectf(x + tab_width - 2, kTabPanelButtonHeight - 2, 2, 2),
 			                  2 * BUTTON_EDGE_BRIGHT_FACTOR);
 
=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2016-10-23 12:59:11 +0000
+++ src/ui_basic/window.cc	2016-10-29 10:23:37 +0000
@@ -226,7 +226,7 @@
 	Panel& parent = *get_parent();
 
 	set_pos(Vector2i((static_cast<int32_t>(parent.get_inner_w()) - get_w()) / 2,
-	              (static_cast<int32_t>(parent.get_inner_h()) - get_h()) / 2));
+	                 (static_cast<int32_t>(parent.get_inner_h()) - get_h()) / 2));
 }
 
 /**
@@ -234,7 +234,8 @@
  */
 void Window::draw(RenderTarget& dst) {
 	if (!is_minimal()) {
-		dst.tile(Recti(Vector2i(0, 0), get_inner_w(), get_inner_h()), pic_background_, Vector2i(0, 0));
+		dst.tile(
+		   Recti(Vector2i(0, 0), get_inner_w(), get_inner_h()), pic_background_, Vector2i(0, 0));
 	}
 }
 
@@ -257,8 +258,9 @@
 		//  top bar
 		static_assert(0 <= HZ_B_CORNER_PIXMAP_LEN, "assert(0 <= HZ_B_CORNER_PIXMAP_LEN) failed.");
 		for (; pos < hz_bar_end_minus_middle; pos += HZ_B_MIDDLE_PIXMAP_LEN)
-			dst.blitrect(Vector2f(pos, 0), pic_top_, Recti(Vector2i(HZ_B_CORNER_PIXMAP_LEN, 0),
-			                                           HZ_B_MIDDLE_PIXMAP_LEN, TP_B_PIXMAP_THICKNESS));
+			dst.blitrect(
+			   Vector2f(pos, 0), pic_top_, Recti(Vector2i(HZ_B_CORNER_PIXMAP_LEN, 0),
+			                                     HZ_B_MIDDLE_PIXMAP_LEN, TP_B_PIXMAP_THICKNESS));
 
 		// odd pixels of top bar and top right corner
 		const int32_t width = hz_bar_end - pos + HZ_B_CORNER_PIXMAP_LEN;
@@ -295,15 +297,16 @@
 			//  left bar
 			static_assert(0 <= VT_B_THINGY_PIXMAP_LEN, "assert(0 <= VT_B_THINGY_PIXMAP_LEN) failed.");
 			for (; pos < vt_bar_end_minus_middle; pos += VT_B_MIDDLE_PIXMAP_LEN)
-				dst.blitrect(
-				   Vector2f(0, pos), pic_lborder_, Recti(Vector2i(0, VT_B_THINGY_PIXMAP_LEN),
-				                                     VT_B_PIXMAP_THICKNESS, VT_B_MIDDLE_PIXMAP_LEN));
+				dst.blitrect(Vector2f(0, pos), pic_lborder_,
+				             Recti(Vector2i(0, VT_B_THINGY_PIXMAP_LEN), VT_B_PIXMAP_THICKNESS,
+				                   VT_B_MIDDLE_PIXMAP_LEN));
 
 			//  odd pixels of left bar and left bottom thingy
 			const int32_t height = vt_bar_end - pos + VT_B_THINGY_PIXMAP_LEN;
 			assert(0 <= VT_B_TOTAL_PIXMAP_LEN - height);
-			dst.blitrect(Vector2f(0, pos), pic_lborder_, Recti(Vector2i(0, VT_B_TOTAL_PIXMAP_LEN - height),
-			                                               VT_B_PIXMAP_THICKNESS, height));
+			dst.blitrect(
+			   Vector2f(0, pos), pic_lborder_,
+			   Recti(Vector2i(0, VT_B_TOTAL_PIXMAP_LEN - height), VT_B_PIXMAP_THICKNESS, height));
 		}
 
 		{  // Right border
@@ -320,7 +323,7 @@
 			for (; pos < vt_bar_end_minus_middle; pos += VT_B_MIDDLE_PIXMAP_LEN)
 				dst.blitrect(Vector2f(right_border_x, pos), pic_rborder_,
 				             Recti(Vector2i(0, VT_B_THINGY_PIXMAP_LEN), VT_B_PIXMAP_THICKNESS,
-				                  VT_B_MIDDLE_PIXMAP_LEN));
+				                   VT_B_MIDDLE_PIXMAP_LEN));
 
 			// odd pixels of right bar and right bottom thingy
 			const int32_t height = vt_bar_end - pos + VT_B_THINGY_PIXMAP_LEN;
@@ -340,12 +343,13 @@
 			for (; pos < hz_bar_end_minus_middle; pos += HZ_B_MIDDLE_PIXMAP_LEN)
 				dst.blitrect(Vector2f(pos, get_h() - BT_B_PIXMAP_THICKNESS), pic_bottom_,
 				             Recti(Vector2i(HZ_B_CORNER_PIXMAP_LEN, 0), HZ_B_MIDDLE_PIXMAP_LEN,
-				                  BT_B_PIXMAP_THICKNESS));
+				                   BT_B_PIXMAP_THICKNESS));
 
 			// odd pixels of bottom bar and bottom right corner
 			const int32_t width = hz_bar_end - pos + HZ_B_CORNER_PIXMAP_LEN;
-			dst.blitrect(Vector2f(pos, get_h() - BT_B_PIXMAP_THICKNESS), pic_bottom_,
-			             Recti(Vector2i(HZ_B_TOTAL_PIXMAP_LEN - width, 0), width, BT_B_PIXMAP_THICKNESS));
+			dst.blitrect(
+			   Vector2f(pos, get_h() - BT_B_PIXMAP_THICKNESS), pic_bottom_,
+			   Recti(Vector2i(HZ_B_TOTAL_PIXMAP_LEN - width, 0), width, BT_B_PIXMAP_THICKNESS));
 		}
 	}
 }
 
=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2016-10-25 07:07:14 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2016-10-29 10:23:37 +0000
@@ -650,7 +650,7 @@
 	suggested_teams_box_->show(map.get_suggested_teams());
 	suggested_teams_box_->set_pos(
 	   Vector2i(suggested_teams_box_->get_x(),
-	         back_.get_y() - padding_ - suggested_teams_box_->get_h() - padding_));
+	            back_.get_y() - padding_ - suggested_teams_box_->get_h() - padding_));
 }
 
 /// Show help
 
=== modified file 'src/ui_fsmenu/launch_spg.cc'
--- src/ui_fsmenu/launch_spg.cc	2016-10-24 14:05:58 +0000
+++ src/ui_fsmenu/launch_spg.cc	2016-10-29 10:23:37 +0000
@@ -33,7 +33,6 @@
 #include "logic/game.h"
 #include "logic/game_controller.h"
 #include "logic/game_settings.h"
-#include "logic/map.h"
 #include "logic/map_objects/map_object.h"
 #include "logic/player.h"
 #include "map_io/map_loader.h"
@@ -61,14 +60,12 @@
                  buth_,
                  g_gr->images().get("images/ui_basic/but1.png"),
                  _("Select map")),
-     wincondition_(this,
-                   "win_condition",
-                   get_w() * 7 / 10,
-                   get_h() * 4 / 10 + buth_,
-                   butw_,
-                   buth_,
-                   g_gr->images().get("images/ui_basic/but1.png"),
-                   ""),
+     win_condition_dropdown_(this,
+                             get_w() * 7 / 10,
+                             get_h() * 4 / 10 + buth_,
+                             butw_,
+                             get_h() - get_h() * 4 / 10 - buth_,
+                             ""),
      back_(this,
            "back",
            get_w() * 7 / 10,
@@ -127,15 +124,12 @@
      is_scenario_(false) {
 	select_map_.sigclicked.connect(
 	   boost::bind(&FullscreenMenuLaunchSPG::select_map, boost::ref(*this)));
-	wincondition_.sigclicked.connect(
-	   boost::bind(&FullscreenMenuLaunchSPG::win_condition_clicked, boost::ref(*this)));
+	win_condition_dropdown_.selected.connect(
+	   boost::bind(&FullscreenMenuLaunchSPG::win_condition_selected, this));
 	back_.sigclicked.connect(boost::bind(&FullscreenMenuLaunchSPG::clicked_back, boost::ref(*this)));
 	ok_.sigclicked.connect(boost::bind(&FullscreenMenuLaunchSPG::clicked_ok, boost::ref(*this)));
 
 	lua_ = new LuaInterface();
-	win_condition_scripts_ = settings_->settings().win_condition_scripts;
-	cur_wincondition_ = -1;
-	win_condition_clicked();
 
 	title_.set_fontsize(UI_FONT_SIZE_BIG);
 
@@ -203,68 +197,113 @@
 }
 
 /**
- * WinCondition button has been pressed
- */
-void FullscreenMenuLaunchSPG::win_condition_clicked() {
-	if (settings_->can_change_map()) {
-		cur_wincondition_++;
-		cur_wincondition_ %= win_condition_scripts_.size();
-		settings_->set_win_condition_script(win_condition_scripts_[cur_wincondition_]);
-	}
-
-	win_condition_update();
-}
-
-/**
- * update win conditions information
- */
-void FullscreenMenuLaunchSPG::win_condition_update() {
+ * Fill the dropdown with the available win conditions.
+ */
+void FullscreenMenuLaunchSPG::update_win_conditions() {
+	win_condition_dropdown_.clear();
 	if (settings_->settings().scenario) {
-		wincondition_.set_title(_("Scenario"));
-		wincondition_.set_tooltip(_("Win condition is set through the scenario"));
+		win_condition_dropdown_.set_label(_("Scenario"));
+		win_condition_dropdown_.set_tooltip(_("Win condition is set through the scenario"));
+		win_condition_dropdown_.set_enabled(false);
 	} else {
-		win_condition_load();
-	}
-}
-
-/**
- * Loads the current win condition script from the settings provider.
- * Calls win_condition_clicked() if the current map can't handle the win condition.
- */
-void FullscreenMenuLaunchSPG::win_condition_load() {
+		win_condition_dropdown_.set_label("");
+		win_condition_dropdown_.set_tooltip("");
+		Widelands::Map map;
+		std::unique_ptr<Widelands::MapLoader> ml =
+		   map.get_correct_loader(settings_->settings().mapfilename);
+		if (ml != nullptr) {
+			ml->preload_map(true);
+			load_win_conditions(map);
+		} else {
+			const std::string error_message =
+			   (boost::format(_("Unable to determine valid win conditions because the map '%s' could "
+			                    "not be loaded.")) %
+			    settings_->settings().mapfilename)
+			      .str();
+			win_condition_dropdown_.set_label(_("Error"));
+			win_condition_dropdown_.set_tooltip(error_message);
+			log("LaunchSPG: No map loader: %s\n", error_message.c_str());
+		}
+		win_condition_dropdown_.set_enabled(true);
+	}
+}
+
+void FullscreenMenuLaunchSPG::load_win_conditions(const Widelands::Map& map) {
+	try {
+		const std::set<std::string> tags = map.get_tags();
+		// Make sure that the last win condition is still valid. If not, pick the first one
+		// available.
+		if (last_win_condition_.empty()) {
+			last_win_condition_ = settings_->settings().win_condition_scripts.front();
+		}
+		std::unique_ptr<LuaTable> t = win_condition_if_valid(last_win_condition_, tags);
+		for (const std::string& win_condition_script : settings_->settings().win_condition_scripts) {
+			if (t) {
+				break;
+			} else {
+				last_win_condition_ = win_condition_script;
+				t = win_condition_if_valid(last_win_condition_, tags);
+			}
+		}
+
+		// Now fill the dropdown.
+		for (const std::string& win_condition_script : settings_->settings().win_condition_scripts) {
+			try {
+				t = win_condition_if_valid(win_condition_script, tags);
+				if (t) {
+					i18n::Textdomain td("win_conditions");
+					win_condition_dropdown_.add(_(t->get_string("name")), win_condition_script, nullptr,
+					                            win_condition_script == last_win_condition_,
+					                            t->get_string("description"));
+				}
+			} catch (LuaTableKeyError& e) {
+				log("LaunchSPG: Error loading win condition: %s %s\n", win_condition_script.c_str(),
+				    e.what());
+			}
+		}
+	} catch (const std::exception& e) {
+		const std::string error_message =
+		   (boost::format(_("Unable to determine valid win conditions because the map '%s' "
+		                    "could not be loaded.")) %
+		    settings_->settings().mapfilename)
+		      .str();
+		win_condition_dropdown_.set_label(_("Error"));
+		win_condition_dropdown_.set_tooltip(error_message);
+		log("LaunchSPG: Exception: %s %s\n", error_message.c_str(), e.what());
+	}
+}
+
+void FullscreenMenuLaunchSPG::win_condition_selected() {
+	last_win_condition_ = win_condition_dropdown_.get_selected();
+}
+
+// TODO(GunChleoc): Turn this into a free standing function. It seems it is not using any state.
+std::unique_ptr<LuaTable>
+FullscreenMenuLaunchSPG::win_condition_if_valid(const std::string& win_condition_script,
+                                                std::set<std::string> tags) const {
 	bool is_usable = true;
+	std::unique_ptr<LuaTable> t;
 	try {
-		std::unique_ptr<LuaTable> t = lua_->run_script(settings_->get_win_condition_script());
+		t = lua_->run_script(win_condition_script);
 		t->do_not_warn_about_unaccessed_keys();
 
 		// Skip this win condition if the map doesn't have all the required tags
-		if (t->has_key("map_tags") && !settings_->settings().mapfilename.empty()) {
-			Widelands::Map map;
-			std::unique_ptr<Widelands::MapLoader> ml =
-			   map.get_correct_loader(settings_->settings().mapfilename);
-			ml->preload_map(true);
+		if (t->has_key("map_tags")) {
 			for (const std::string& map_tag : t->get_table("map_tags")->array_entries<std::string>()) {
-				if (!map.has_tag(map_tag)) {
+				if (!tags.count(map_tag)) {
 					is_usable = false;
 					break;
 				}
 			}
 		}
-
-		const std::string name = t->get_string("name");
-		const std::string descr = t->get_string("description");
-		{
-			i18n::Textdomain td("win_conditions");
-			wincondition_.set_title(_(name));
-		}
-		wincondition_.set_tooltip(descr.c_str());
-	} catch (LuaTableKeyError&) {
-		// might be that this is not a win condition after all.
-		is_usable = false;
+	} catch (LuaTableKeyError& e) {
+		log(
+		   "LaunchSPG: Error loading win condition: %s %s\n", win_condition_script.c_str(), e.what());
 	}
 	if (!is_usable) {
-		win_condition_clicked();
+		t.reset(nullptr);
 	}
+	return t;
 }
 
 /**
@@ -285,6 +324,7 @@
 		if (is_scenario_) {
 			end_modal<FullscreenMenuBase::MenuTarget>(FullscreenMenuBase::MenuTarget::kScenarioGame);
 		} else {
+			settings_->set_win_condition_script(win_condition_dropdown_.get_selected());
 			end_modal<FullscreenMenuBase::MenuTarget>(FullscreenMenuBase::MenuTarget::kNormalGame);
 		}
 	}
@@ -310,7 +350,6 @@
 
 	select_map_.set_visible(settings_->can_change_map());
 	select_map_.set_enabled(settings_->can_change_map());
-	wincondition_.set_enabled(settings_->can_change_map() && !settings.scenario);
 
 	if (settings.scenario) {
 		set_scenario_values();
@@ -329,8 +368,6 @@
 	// update the player description groups
 	for (uint32_t i = 0; i < kMaxPlayers; ++i)
 		players_[i]->refresh();
-
-	win_condition_update();
 }
 
 /**
@@ -357,6 +394,7 @@
 
 	safe_place_for_host(nr_players_);
 	settings_->set_map(mapdata.name, mapdata.filename, nr_players_);
+	update_win_conditions();
 }
 
 /**
 
=== modified file 'src/ui_fsmenu/launch_spg.h'
--- src/ui_fsmenu/launch_spg.h	2016-10-21 08:21:41 +0000
+++ src/ui_fsmenu/launch_spg.h	2016-10-29 10:23:37 +0000
@@ -20,10 +20,13 @@
 #ifndef WL_UI_FSMENU_LAUNCH_SPG_H
 #define WL_UI_FSMENU_LAUNCH_SPG_H
 
+#include <memory>
 #include <string>
 
 #include "graphic/playercolor.h"
+#include "logic/map.h"
 #include "ui_basic/button.h"
+#include "ui_basic/dropdown.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/textarea.h"
 #include "ui_fsmenu/base.h"
@@ -64,9 +67,19 @@
 	LuaInterface* lua_;
 
 	void select_map();
-	void win_condition_clicked();
-	void win_condition_update();
-	void win_condition_load();
+	/// Loads all win conditions that can be played with the map into the selection dropdown.
+	/// Disables the dropdown if the map is a scenario.
+	void update_win_conditions();
+	/// Reads the win conditions that are available for the given map and adds the entries to the
+	/// dropdown.
+	void load_win_conditions(const Widelands::Map& map);
+	/// Remembers the win condition that is currently selected in the dropdown.
+	void win_condition_selected();
+	/// If the win condition in 'win_condition_script' can be played with the map tags,
+	/// parses the win condition and returns it as a std::unique_ptr<LuaTable>.
+	/// If this win condition can't be played with the map tags, returns a unique_ptr to nullptr.
+	std::unique_ptr<LuaTable> win_condition_if_valid(const std::string& win_condition_script,
+	                                                 std::set<std::string> tags) const;
 	void set_scenario_values();
 	void switch_to_position(uint8_t);
 	void safe_place_for_host(uint8_t);
@@ -74,7 +87,10 @@
 	uint32_t butw_;
 	uint32_t buth_;
 
-	UI::Button select_map_, wincondition_, back_, ok_;
+	UI::Button select_map_;
+	UI::Dropdown<std::string> win_condition_dropdown_;
+	std::string last_win_condition_;
+	UI::Button back_, ok_;
 	UI::Button* pos_[kMaxPlayers];
 	UI::Textarea title_, mapname_;
 	UI::Textarea name_, type_, team_, tribe_, init_, wincondition_type_;
@@ -87,8 +103,6 @@
 	std::string player_save_tribe_[kMaxPlayers];
 	int8_t nr_players_;
 	bool is_scenario_;
-	std::vector<std::string> win_condition_scripts_;
-	uint8_t cur_wincondition_;
 };
 
 #endif  // end of include guard: WL_UI_FSMENU_LAUNCH_SPG_H
 
=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2016-10-24 14:04:00 +0000
+++ src/ui_fsmenu/mapselect.cc	2016-10-29 10:23:37 +0000
@@ -81,7 +81,8 @@
 	   new UI::Box(this, tablex_, checkboxes_y_, UI::Box::Horizontal, checkbox_space_, get_w());
 
 	// Must be initialized before tag checkboxes
-	cb_dont_localize_mapnames_ = new UI::Checkbox(vbox, Vector2i(0, 0), _("Show original map names"));
+	cb_dont_localize_mapnames_ =
+	   new UI::Checkbox(vbox, Vector2i(0, 0), _("Show original map names"));
 	cb_dont_localize_mapnames_->set_state(false);
 	cb_dont_localize_mapnames_->changedto.connect(
 	   boost::bind(&FullscreenMenuMapSelect::fill_table, boost::ref(*this)));
 
=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2016-10-24 14:04:00 +0000
+++ src/ui_fsmenu/options.cc	2016-10-29 10:23:37 +0000
@@ -144,11 +144,20 @@
      box_sound_(&tabs_, 0, 0, UI::Box::Vertical, 0, 0, padding_),
      box_saving_(&tabs_, 0, 0, UI::Box::Vertical, 0, 0, padding_),
      box_game_(&tabs_, 0, 0, UI::Box::Vertical, 0, 0, padding_),
-     box_language_(&tabs_, 0, 0, UI::Box::Vertical, 0, 0, padding_),
 
      // Interface options
-     label_resolution_(&box_interface_, _("In-game resolution"), UI::Align::kLeft),
-     resolution_list_(&box_interface_, 0, 0, column_width_ / 2, 80, true),
+     language_dropdown_(&box_interface_,
+                        0,
+                        0,
+                        column_width_ / 2,
+                        get_inner_h() - tab_panel_y_ - buth_ - hmargin_ - 4 * padding_,
+                        _("Language")),
+     resolution_dropdown_(&box_interface_,
+                          0,
+                          0,
+                          column_width_ / 2,
+                          get_inner_h() - tab_panel_y_ - 2 * buth_ - hmargin_ - 5 * padding_,
+                          _("In-game resolution")),
 
      fullscreen_(&box_interface_, Vector2i(0, 0), _("Fullscreen"), "", column_width_),
      inputgrab_(&box_interface_, Vector2i(0, 0), _("Grab Input"), "", column_width_),
@@ -236,7 +245,8 @@
                         column_width_),
 
      // Game options
-     auto_roadbuild_mode_(&box_game_, Vector2i(0, 0), _("Start building road after placing a flag")),
+     auto_roadbuild_mode_(
+        &box_game_, Vector2i(0, 0), _("Start building road after placing a flag")),
      show_workarea_preview_(&box_game_, Vector2i(0, 0), _("Show buildings area preview")),
      transparent_chat_(&box_game_,
                        Vector2i(0, 0),
@@ -248,15 +258,6 @@
      /** TRANSLATORS: and it also lets you jump to it on the map. */
      single_watchwin_(&box_game_, Vector2i(0, 0), _("Use single watchwindow mode")),
 
-     // Language options
-     label_language_(&box_language_, _("Language"), UI::Align::kLeft),
-     language_list_(&box_language_,
-                    0,
-                    0,
-                    column_width_ / 2,
-                    get_inner_h() - tab_panel_y_ - 2 * buth_ - hmargin_ - 5 * padding_,
-                    true),
-
      os_(opt) {
 	// Set up UI Elements
 	title_.set_fontsize(UI_FONT_SIZE_BIG);
@@ -266,7 +267,6 @@
 	tabs_.add("options_sound", _("Sound"), &box_sound_, "");
 	tabs_.add("options_saving", _("Saving"), &box_saving_, "");
 	tabs_.add("options_game", _("Game"), &box_game_, "");
-	tabs_.add("options_language", _("Language"), &box_language_, "");
 
 	// We want the last active tab when "Apply" was clicked.
 	if (os_.active_tab < tabs_.tabs().size()) {
@@ -280,11 +280,10 @@
 	box_sound_.set_size(tabs_.get_inner_w(), tabs_.get_inner_h());
 	box_saving_.set_size(tabs_.get_inner_w(), tabs_.get_inner_h());
 	box_game_.set_size(tabs_.get_inner_w(), tabs_.get_inner_h());
-	box_language_.set_size(tabs_.get_inner_w(), tabs_.get_inner_h());
 
 	// Interface
-	box_interface_.add(&label_resolution_, UI::Align::kLeft);
-	box_interface_.add(&resolution_list_, UI::Align::kLeft);
+	box_interface_.add(&language_dropdown_, UI::Align::kLeft);
+	box_interface_.add(&resolution_dropdown_, UI::Align::kLeft);
 	box_interface_.add(&fullscreen_, UI::Align::kLeft);
 	box_interface_.add(&inputgrab_, UI::Align::kLeft);
 	box_interface_.add(&sb_maxfps_, UI::Align::kLeft);
@@ -312,10 +311,6 @@
 	box_game_.add(&transparent_chat_, UI::Align::kLeft);
 	box_game_.add(&single_watchwin_, UI::Align::kLeft);
 
-	// Language
-	box_language_.add(&label_language_, UI::Align::kLeft);
-	box_language_.add(&language_list_, UI::Align::kLeft);
-
 	// Bind actions
 	cancel_.sigclicked.connect(boost::bind(&FullscreenMenuOptions::clicked_back, this));
 	apply_.sigclicked.connect(boost::bind(&FullscreenMenuOptions::clicked_apply, this));
@@ -346,18 +341,18 @@
 	for (uint32_t i = 0; i < resolutions_.size(); ++i) {
 		const bool selected = resolutions_[i].xres == opt.xres && resolutions_[i].yres == opt.yres;
 		did_select_a_res |= selected;
-		/** TRANSLATORS: Screen resolution, e.g. 800 x 600*/
-		resolution_list_.add(
-		   (boost::format(_("%1% x %2%")) % resolutions_[i].xres % resolutions_[i].yres).str(),
-		   nullptr, nullptr, selected);
+		resolution_dropdown_.add(
+		   /** TRANSLATORS: Screen resolution, e.g. 800 x 600*/
+		   (boost::format(_("%1% x %2%")) % resolutions_[i].xres % resolutions_[i].yres).str(), i,
+		   nullptr, selected);
 	}
 	if (!did_select_a_res) {
-		resolution_list_.add(
-		   (boost::format(_("%1% x %2%")) % opt.xres % opt.yres).str(), nullptr, nullptr, true);
 		uint32_t entry = resolutions_.size();
 		resolutions_.resize(entry + 1);
 		resolutions_[entry].xres = opt.xres;
 		resolutions_[entry].yres = opt.yres;
+		resolution_dropdown_.add(
+		   (boost::format(_("%1% x %2%")) % opt.xres % opt.yres).str(), entry, nullptr, true);
 	}
 
 	fullscreen_.set_state(opt.fullscreen);
@@ -386,14 +381,13 @@
 
 	// Language options
 	add_languages_to_list(opt.language);
-	language_list_.focus();
 }
 
 void FullscreenMenuOptions::add_languages_to_list(const std::string& current_locale) {
 
 	// We want these two entries on top - the most likely user's choice and the default.
-	language_list_.add(_("Try system language"), "", nullptr, current_locale == "");
-	language_list_.add("English", "en", nullptr, current_locale == "en");
+	language_dropdown_.add(_("Try system language"), "", nullptr, current_locale == "");
+	language_dropdown_.add("English", "en", nullptr, current_locale == "en");
 
 	// Add translation directories to the list
 	std::vector<LanguageEntry> entries;
@@ -442,8 +436,8 @@
 	find_selected_locale(&selected_locale, current_locale);
 	std::sort(entries.begin(), entries.end());
 	for (const LanguageEntry& entry : entries) {
-		language_list_.add(entry.descname.c_str(), entry.localename, nullptr,
-		                   entry.localename == selected_locale, "");
+		language_dropdown_.add(entry.descname.c_str(), entry.localename, nullptr,
+		                       entry.localename == selected_locale, "");
 	}
 }
 
@@ -454,9 +448,14 @@
 OptionsCtrl::OptionsStruct FullscreenMenuOptions::get_values() {
 	// Write all data from UI elements
 	// Interface options
-	const uint32_t res_index = resolution_list_.selection_index();
-	os_.xres = resolutions_[res_index].xres;
-	os_.yres = resolutions_[res_index].yres;
+	if (language_dropdown_.has_selection()) {
+		os_.language = language_dropdown_.get_selected();
+	}
+	if (resolution_dropdown_.has_selection()) {
+		const uint32_t res_index = resolution_dropdown_.get_selected();
+		os_.xres = resolutions_[res_index].xres;
+		os_.yres = resolutions_[res_index].yres;
+	}
 	os_.fullscreen = fullscreen_.get_state();
 	os_.inputgrab = inputgrab_.get_state();
 	os_.maxfps = sb_maxfps_.get_value();
@@ -484,11 +483,6 @@
 	os_.transparent_chat = transparent_chat_.get_state();
 	os_.single_watchwin = single_watchwin_.get_state();
 
-	// Language options
-	if (language_list_.has_selection()) {
-		os_.language = language_list_.get_selected();
-	}
-
 	// Last tab for reloading the options menu
 	os_.active_tab = tabs_.active();
 	return os_;
 
=== modified file 'src/ui_fsmenu/options.h'
--- src/ui_fsmenu/options.h	2016-08-04 15:49:05 +0000
+++ src/ui_fsmenu/options.h	2016-10-29 10:23:37 +0000
@@ -27,7 +27,7 @@
 
 #include "ui_basic/button.h"
 #include "ui_basic/checkbox.h"
-#include "ui_basic/listselect.h"
+#include "ui_basic/dropdown.h"
 #include "ui_basic/multilinetextarea.h"
 #include "ui_basic/spinbox.h"
 #include "ui_basic/tabpanel.h"
@@ -122,11 +122,10 @@
 	UI::Box box_sound_;
 	UI::Box box_saving_;
 	UI::Box box_game_;
-	UI::Box box_language_;
 
 	// Interface options
-	UI::Textarea label_resolution_;
-	UI::Listselect<void*> resolution_list_;
+	UI::Dropdown<std::string> language_dropdown_;
+	UI::Dropdown<uintptr_t> resolution_dropdown_;
 	UI::Checkbox fullscreen_;
 	UI::Checkbox inputgrab_;
 	UI::SpinBox sb_maxfps_;
@@ -154,10 +153,6 @@
 	UI::Checkbox transparent_chat_;
 	UI::Checkbox single_watchwin_;
 
-	// Language options
-	UI::Textarea label_language_;
-	UI::Listselect<std::string> language_list_;
-
 	OptionsCtrl::OptionsStruct os_;
 
 	class ScreenResolution {
 
=== modified file 'src/wui/game_objectives_menu.cc'
--- src/wui/game_objectives_menu.cc	2016-08-04 15:49:05 +0000
+++ src/wui/game_objectives_menu.cc	2016-10-29 10:23:37 +0000
@@ -40,7 +40,7 @@
                       580,
                       5 + OBJECTIVE_LIST + 5 + FULL_OBJECTIVE_TEXT + 5 + BUTTON_HEIGHT + 5,
                       _("Objectives")),
-     list(this, 5, 5, get_inner_w() - 10, OBJECTIVE_LIST, false),
+	  list(this, 5, 5, get_inner_w() - 10, OBJECTIVE_LIST),
      objectivetext(this,
                    5,
                    130,