Merge lp:~widelands-dev/widelands/bug-1664052-expedition-shipwindow-crash into lp:widelands

[GunChleoc]

Do not delete/recreate buttons in the ship window. This fixes a segfault with the button signals. This also makes NoteShipWindow::Action::kRefresh obsolete. Also, some layout tweaks to the shipwindow.

[kaputtnik (franku)]

Started and canceled an expedition about 10 times and no crash anymore.

What i noticed:
1. The Black 'Cargo-space' does not fill the entire window anymore... intended?
2. If an expedition is canceled the button 'Cancel expedition is removed from the ship window. But if you close the ship window and reopen it, the button is there again.

An Idea to 1.: Is it possible to have an image there where the black area is? I am thinking of a wooden ship hold with some book shelf, enlightened with a candle or so... :-D

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2037. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/207741358.
Appveyor build 1872. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1872.

[GunChleoc (gunchleoc)]

1. I added some padding around the navigation buttons, if this is what you mean. A background image would be possible, but someone needs to make one first - that's beyond my skills. Let me know if you want to try - I will code a branch then so you can drop in the image and see it in-game.

2. Thanks, should be fixed now.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2040. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/207850688.
Appveyor build 1875. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1875.

[kaputtnik (franku)]

Ah, ok i see... i meant formerly the black area fits the whole inner window, whereas now there is some space on the left and right between window border and black area. It looks like the black area is in the air somehow.

I have no time (and maybe no experience) for creating such an image i mentioned. But maybe it is possible to have something like shown in the bottom of this mockup: https://bugs.launchpad.net/widelands/+bug/1664052/+attachment/4831701/+files/laderaum_1.png (just compared ship windows: Old style, this branch, and a suggestion)

Otherwise looks good :-)

[GunChleoc (gunchleoc)]

I like the mockup - should be doable :)

[GunChleoc (gunchleoc)]

Prettification is done.

I also rearranged the buttons on the bottom - the shipwindow was the only window where the goto-button is on the left.

[kaputtnik (franku)]

Looks good :-)

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2056. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/209994662.
Appveyor build 1891. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1891.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2094. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/223928118.
Appveyor build 1929. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1929.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2116. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/225038488.
Appveyor build 1951. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1951.

[GunChleoc (gunchleoc)]

*bump* I'd like this branch to be next in line for code review.

review: Needs Resubmitting

[Klaus Halfmann (klaus-halfmann)]

Mhh, this looks familiar, we had a similar Issue where some Notfication was caught by some other ship.
Ill try to have a lok tonight.

[Klaus Halfmann (klaus-halfmann)]

What I get is that you moved around some code from ::init to the CTor for that shipwindow.
See som inline comments.

I see no obvious Problems in that code, no let mey try to download it from appvoyer ors such.

review: Approve (review, compile)

[Klaus Halfmann (klaus-halfmann)]

Will try that one now: https://ci.appveyor.com/api/buildjobs/qsar8xtu6u7jsjjv/artifacts/Widelands-_widelands_dev_widelands_bug_1664052_expedition_shipwindow_crash-1872-Debug-x64.exe

[GunChleoc (gunchleoc)]

Thanks for the review :)

Kaputtnik has already tested this branch, so I'll merge trunk and then get this in.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc	2017-07-01 15:36:36 +0000
+++ src/economy/portdock.cc	2017-08-16 04:49:28 +0000
@@ -337,7 +337,6 @@
 			// The expedition goods are now on the ship, so from now on it is independent from the port
 			// and thus we switch the port to normal, so we could even start a new expedition,
 			cancel_expedition(game);
-			Notifications::publish(NoteShipWindow(ship.serial(), NoteShipWindow::Action::kRefresh));
 			return fleet_->update(game);
 		}
 	}

=== modified file 'src/logic/map_objects/tribes/ship.cc'
--- src/logic/map_objects/tribes/ship.cc	2017-08-09 19:25:04 +0000
+++ src/logic/map_objects/tribes/ship.cc	2017-08-16 04:49:28 +0000
@@ -680,8 +680,6 @@
 			}
 
 			expedition_.reset(nullptr);
-
-			Notifications::publish(NoteShipWindow(serial(), NoteShipWindow::Action::kRefresh));
 			return start_task_idle(game, descr().main_animation(), 1500);
 		}
 	}
@@ -942,9 +940,6 @@
 
 	// Delete the expedition and the economy it created.
 	expedition_.reset(nullptr);
-
-	// And finally update our ship window
-	Notifications::publish(NoteShipWindow(serial(), NoteShipWindow::Action::kRefresh));
 }
 
 /// Sinks the ship

=== modified file 'src/wui/itemwaresdisplay.cc'
--- src/wui/itemwaresdisplay.cc	2017-06-23 17:23:04 +0000
+++ src/wui/itemwaresdisplay.cc	2017-08-16 04:49:28 +0000
@@ -22,16 +22,18 @@
 #include "graphic/rendertarget.h"
 #include "logic/map_objects/tribes/tribe_descr.h"
 #include "logic/player.h"
+#include "ui_basic/mouse_constants.h"
 
 namespace {
 
+constexpr int kMargin = 4;
 static const uint32_t IWD_HBorder = 10;
 static const uint32_t IWD_VBorder = 10;
 static const uint32_t IWD_DefaultItemsPerRow = 9;
 static const uint32_t IWD_ItemWidth = 14;
 static const uint32_t IWD_ItemHeight = 26;
 static const uint32_t IWD_WorkerBaseline =
-   -2;  ///< Offset of anim center from bottom border of item rect
+	2;  ///< Offset of anim center from bottom border of item rect
 static const uint32_t IWD_WareBaseLine = -6;
 
 }  // anonymous namespace
@@ -44,7 +46,7 @@
      player_(gplayer),
      capacity_(0),
      items_per_row_(IWD_DefaultItemsPerRow) {
-	set_desired_size(2 * IWD_HBorder, 2 * IWD_VBorder);
+	recalc_desired_size();
 }
 
 /**
@@ -72,7 +74,7 @@
 	uint32_t rowitems = capacity_ >= items_per_row_ ? items_per_row_ : capacity_;
 
 	set_desired_size(
-	   2 * IWD_HBorder + rowitems * IWD_ItemWidth, 2 * IWD_VBorder + nrrows * IWD_ItemHeight);
+		2 * (IWD_HBorder + kMargin) + rowitems * IWD_ItemWidth, 2 * (IWD_VBorder + kMargin) + nrrows * IWD_ItemHeight);
 }
 
 /**
@@ -88,15 +90,29 @@
 void ItemWaresDisplay::draw(RenderTarget& dst) {
 	const Widelands::TribeDescr& tribe(player().tribe());
 
-	dst.fill_rect(Recti(0, 0, get_w(), get_h()), RGBAColor(0, 0, 0, 0));
+	// Snazzy background
+	const int width = get_w() - 2 * kMargin;
+	const int height = get_h() - 2 * kMargin;
+	RGBAColor black(0, 0, 0, 255);
+	dst.brighten_rect(Recti(kMargin, kMargin, width - 1, height - 1), -BUTTON_EDGE_BRIGHT_FACTOR / 2);
+	//  bottom edge
+	dst.brighten_rect(Recti(kMargin, height + 2, width, 2), 1.5 * BUTTON_EDGE_BRIGHT_FACTOR);
+	//  right edge
+	dst.brighten_rect(Recti(kMargin + width - 2, kMargin, 2, height - 2), 1.5 * BUTTON_EDGE_BRIGHT_FACTOR);
+	//  top edge
+	dst.fill_rect(Recti(kMargin, kMargin, width - 1, 1), black);
+	dst.fill_rect(Recti(kMargin, kMargin + 1, width - 2, 1), black);
+	//  left edge
+	dst.fill_rect(Recti(kMargin, kMargin, 1, height - 1), black);
+	dst.fill_rect(Recti(kMargin + 1, kMargin, 1, height - 2), black);
 
 	for (uint32_t idx = 0; idx < items_.size(); ++idx) {
 		const Item& it = items_[idx];
 		uint32_t row = idx / items_per_row_;
 		uint32_t col = idx % items_per_row_;
 
-		uint32_t x = IWD_HBorder / 2 + col * IWD_ItemWidth;
-		uint32_t y = IWD_VBorder + row * IWD_ItemHeight;
+		uint32_t x = IWD_HBorder / 2 + col * IWD_ItemWidth + kMargin;
+		uint32_t y = IWD_VBorder + row * IWD_ItemHeight + kMargin;
 
 		if (it.worker) {
 			y += IWD_WorkerBaseline;

=== modified file 'src/wui/shipwindow.cc'
--- src/wui/shipwindow.cc	2017-06-20 08:18:38 +0000
+++ src/wui/shipwindow.cc	2017-08-16 04:49:28 +0000
@@ -47,13 +47,117 @@
 static const char pic_scout_sw[] = "images/wui/ship/ship_scout_sw.png";
 static const char pic_scout_se[] = "images/wui/ship/ship_scout_se.png";
 static const char pic_construct_port[] = "images/wui/editor/fsel_editor_set_port_space.png";
+
+constexpr int kPadding = 5;
 }  // namespace
 
 using namespace Widelands;
 
 ShipWindow::ShipWindow(InteractiveGameBase& igb, UniqueWindow::Registry& reg, Ship& ship)
-   : UniqueWindow(&igb, "shipwindow", &reg, 0, 0, ship.get_shipname()), igbase_(igb), ship_(ship) {
-	init(false);
+   : UniqueWindow(&igb, "shipwindow", &reg, 0, 0, ship.get_shipname()),
+     igbase_(igb),
+     ship_(ship),
+     vbox_(this, 0, 0, UI::Box::Vertical),
+     navigation_box_(&vbox_, 0, 0, UI::Box::Vertical),
+     navigation_box_height_(0) {
+	vbox_.set_inner_spacing(kPadding);
+	assert(ship_.get_owner());
+
+	display_ = new ItemWaresDisplay(&vbox_, *ship_.get_owner());
+	display_->set_capacity(ship_.descr().get_capacity());
+	vbox_.add(display_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+
+	// Expedition buttons
+	UI::Box* exp_top = new UI::Box(&navigation_box_, 0, 0, UI::Box::Horizontal);
+	navigation_box_.add(exp_top, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+	UI::Box* exp_mid = new UI::Box(&navigation_box_, 0, 0, UI::Box::Horizontal);
+	navigation_box_.add(exp_mid, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+	UI::Box* exp_bot = new UI::Box(&navigation_box_, 0, 0, UI::Box::Horizontal);
+	navigation_box_.add(exp_bot, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+
+	btn_scout_[WALK_NW - 1] =
+	   make_button(exp_top, "scnw", _("Scout towards the north west"), pic_scout_nw,
+	               boost::bind(&ShipWindow::act_scout_towards, this, WALK_NW));
+	exp_top->add(btn_scout_[WALK_NW - 1]);
+
+	btn_explore_island_cw_ = make_button(
+	   exp_top, "expcw", _("Explore the island’s coast clockwise"), pic_explore_cw,
+	   boost::bind(&ShipWindow::act_explore_island, this, IslandExploreDirection::kClockwise));
+	exp_top->add(btn_explore_island_cw_);
+
+	btn_scout_[WALK_NE - 1] =
+	   make_button(exp_top, "scne", _("Scout towards the north east"), pic_scout_ne,
+	               boost::bind(&ShipWindow::act_scout_towards, this, WALK_NE));
+	exp_top->add(btn_scout_[WALK_NE - 1]);
+
+	btn_scout_[WALK_W - 1] = make_button(exp_mid, "scw", _("Scout towards the west"), pic_scout_w,
+	                                     boost::bind(&ShipWindow::act_scout_towards, this, WALK_W));
+	exp_mid->add(btn_scout_[WALK_W - 1]);
+
+	btn_construct_port_ =
+	   make_button(exp_mid, "buildport", _("Construct a port at the current location"),
+	               pic_construct_port, boost::bind(&ShipWindow::act_construct_port, this));
+	exp_mid->add(btn_construct_port_);
+
+	btn_scout_[WALK_E - 1] = make_button(exp_mid, "sce", _("Scout towards the east"), pic_scout_e,
+	                                     boost::bind(&ShipWindow::act_scout_towards, this, WALK_E));
+	exp_mid->add(btn_scout_[WALK_E - 1]);
+
+	btn_scout_[WALK_SW - 1] =
+	   make_button(exp_bot, "scsw", _("Scout towards the south west"), pic_scout_sw,
+	               boost::bind(&ShipWindow::act_scout_towards, this, WALK_SW));
+	exp_bot->add(btn_scout_[WALK_SW - 1]);
+
+	btn_explore_island_ccw_ =
+	   make_button(exp_bot, "expccw", _("Explore the island’s coast counter clockwise"),
+	               pic_explore_ccw, boost::bind(&ShipWindow::act_explore_island, this,
+	                                            IslandExploreDirection::kCounterClockwise));
+	exp_bot->add(btn_explore_island_ccw_);
+
+	btn_scout_[WALK_SE - 1] =
+	   make_button(exp_bot, "scse", _("Scout towards the south east"), pic_scout_se,
+	               boost::bind(&ShipWindow::act_scout_towards, this, WALK_SE));
+	exp_bot->add(btn_scout_[WALK_SE - 1]);
+
+	vbox_.add(&navigation_box_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
+
+	// Bottom buttons
+	UI::Box* buttons = new UI::Box(&vbox_, 0, 0, UI::Box::Horizontal);
+	vbox_.add(buttons, UI::Box::Resizing::kFullSize);
+
+	btn_sink_ = make_button(
+	   buttons, "sink", _("Sink the ship"), pic_sink, boost::bind(&ShipWindow::act_sink, this));
+	buttons->add(btn_sink_);
+
+	btn_cancel_expedition_ =
+	   make_button(buttons, "cancel_expedition", _("Cancel the Expedition"), pic_cancel_expedition,
+	               boost::bind(&ShipWindow::act_cancel_expedition, this));
+	buttons->add(btn_cancel_expedition_);
+
+	buttons->add_inf_space();
+
+	if (igbase_.get_display_flag(InteractiveBase::dfDebug)) {
+		btn_debug_ = make_button(buttons, "debug", _("Show Debug Window"), pic_debug,
+		                         boost::bind(&ShipWindow::act_debug, this));
+		btn_debug_->set_enabled(true);
+		buttons->add(btn_debug_);
+	}
+
+	btn_destination_ = make_button(buttons, "destination", _("Go to destination"), pic_destination,
+	                               boost::bind(&ShipWindow::act_destination, this));
+	btn_destination_->set_enabled(false);
+	buttons->add(btn_destination_);
+
+	btn_goto_ = make_button(
+	   buttons, "goto", _("Go to ship"), pic_goto, boost::bind(&ShipWindow::act_goto, this));
+	buttons->add(btn_goto_);
+
+	set_center_panel(&vbox_);
+	set_thinks(true);
+	set_fastclick_panel(btn_goto_);
+	move_out_of_the_way();
+	warp_mouse_to_fastclick_panel();
+
 	shipnotes_subscriber_ = Notifications::subscribe<Widelands::NoteShipWindow>([this](
 	   const Widelands::NoteShipWindow& note) {
 		if (note.serial == ship_.serial()) {
@@ -72,10 +176,6 @@
 					}
 				}
 				break;
-			// The ship state has changed, e.g. expedition canceled
-			case Widelands::NoteShipWindow::Action::kRefresh:
-				init(true);
-				break;
 			// The ship is no more
 			case Widelands::NoteShipWindow::Action::kClose:
 				// Stop this from thinking to avoid segfaults
@@ -85,108 +185,24 @@
 			}
 		}
 	});
+
+	// Init button visibility
+	navigation_box_height_ = navigation_box_.get_h();
+	navigation_box_.set_visible(false);
+	navigation_box_.set_desired_size(navigation_box_.get_w(), 0);
+	btn_cancel_expedition_->set_enabled(false);
+	think();
 }
 
-void ShipWindow::init(bool avoid_fastclick) {
-	assert(ship_.get_owner());
-
-	vbox_.reset(new UI::Box(this, 0, 0, UI::Box::Vertical));
-
-	display_ = new ItemWaresDisplay(vbox_.get(), *ship_.get_owner());
-	display_->set_capacity(ship_.descr().get_capacity());
-	vbox_->add(display_, UI::Box::Resizing::kAlign, UI::Align::kCenter);
-
-	// Expedition buttons
-	if (ship_.state_is_expedition()) {
-		UI::Box* exp_top = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
-		vbox_->add(exp_top, UI::Box::Resizing::kAlign, UI::Align::kCenter);
-		UI::Box* exp_mid = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
-		vbox_->add(exp_mid, UI::Box::Resizing::kAlign, UI::Align::kCenter);
-		UI::Box* exp_bot = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
-		vbox_->add(exp_bot, UI::Box::Resizing::kAlign, UI::Align::kCenter);
-
-		btn_scout_[WALK_NW - 1] =
-		   make_button(exp_top, "scnw", _("Scout towards the north west"), pic_scout_nw,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_NW));
-		exp_top->add(btn_scout_[WALK_NW - 1]);
-
-		btn_explore_island_cw_ = make_button(
-		   exp_top, "expcw", _("Explore the island’s coast clockwise"), pic_explore_cw,
-		   boost::bind(&ShipWindow::act_explore_island, this, IslandExploreDirection::kClockwise));
-		exp_top->add(btn_explore_island_cw_);
-
-		btn_scout_[WALK_NE - 1] =
-		   make_button(exp_top, "scne", _("Scout towards the north east"), pic_scout_ne,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_NE));
-		exp_top->add(btn_scout_[WALK_NE - 1]);
-
-		btn_scout_[WALK_W - 1] =
-		   make_button(exp_mid, "scw", _("Scout towards the west"), pic_scout_w,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_W));
-		exp_mid->add(btn_scout_[WALK_W - 1]);
-
-		btn_construct_port_ =
-		   make_button(exp_mid, "buildport", _("Construct a port at the current location"),
-		               pic_construct_port, boost::bind(&ShipWindow::act_construct_port, this));
-		exp_mid->add(btn_construct_port_);
-
-		btn_scout_[WALK_E - 1] =
-		   make_button(exp_mid, "sce", _("Scout towards the east"), pic_scout_e,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_E));
-		exp_mid->add(btn_scout_[WALK_E - 1]);
-
-		btn_scout_[WALK_SW - 1] =
-		   make_button(exp_bot, "scsw", _("Scout towards the south west"), pic_scout_sw,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_SW));
-		exp_bot->add(btn_scout_[WALK_SW - 1]);
-
-		btn_explore_island_ccw_ =
-		   make_button(exp_bot, "expccw", _("Explore the island’s coast counter clockwise"),
-		               pic_explore_ccw, boost::bind(&ShipWindow::act_explore_island, this,
-		                                            IslandExploreDirection::kCounterClockwise));
-		exp_bot->add(btn_explore_island_ccw_);
-
-		btn_scout_[WALK_SE - 1] =
-		   make_button(exp_bot, "scse", _("Scout towards the south east"), pic_scout_se,
-		               boost::bind(&ShipWindow::act_scout_towards, this, WALK_SE));
-		exp_bot->add(btn_scout_[WALK_SE - 1]);
-	}
-
-	// Bottom buttons
-	UI::Box* buttons = new UI::Box(vbox_.get(), 0, 0, UI::Box::Horizontal);
-	vbox_->add(buttons);
-
-	btn_goto_ = make_button(
-	   buttons, "goto", _("Go to ship"), pic_goto, boost::bind(&ShipWindow::act_goto, this));
-	buttons->add(btn_goto_);
-	btn_destination_ = make_button(buttons, "destination", _("Go to destination"), pic_destination,
-	                               boost::bind(&ShipWindow::act_destination, this));
-	btn_destination_->set_enabled(false);
-	buttons->add(btn_destination_);
-
-	btn_sink_ = make_button(
-	   buttons, "sink", _("Sink the ship"), pic_sink, boost::bind(&ShipWindow::act_sink, this));
-	buttons->add(btn_sink_);
-
-	if (ship_.state_is_expedition()) {
-		btn_cancel_expedition_ =
-		   make_button(buttons, "cancel_expedition", _("Cancel the Expedition"),
-		               pic_cancel_expedition, boost::bind(&ShipWindow::act_cancel_expedition, this));
-		buttons->add(btn_cancel_expedition_);
-	}
-
-	if (igbase_.get_display_flag(InteractiveBase::dfDebug)) {
-		btn_debug_ = make_button(buttons, "debug", _("Show Debug Window"), pic_debug,
-		                         boost::bind(&ShipWindow::act_debug, this));
-		btn_debug_->set_enabled(true);
-		buttons->add(btn_debug_);
-	}
-	set_center_panel(vbox_.get());
-	set_thinks(true);
-	set_fastclick_panel(btn_goto_);
-	if (!avoid_fastclick) {
-		move_out_of_the_way();
-		warp_mouse_to_fastclick_panel();
+void ShipWindow::set_button_visibility() {
+	if (navigation_box_.is_visible() != ship_.state_is_expedition()) {
+		navigation_box_.set_visible(ship_.state_is_expedition());
+		navigation_box_.set_desired_size(
+		   navigation_box_.get_w(), ship_.state_is_expedition() ? navigation_box_height_ : 0);
+		layout();
+	}
+	if (btn_cancel_expedition_->is_visible() != btn_cancel_expedition_->enabled()) {
+		btn_cancel_expedition_->set_visible(btn_cancel_expedition_->enabled());
 	}
 }
 
@@ -215,7 +231,6 @@
 		}
 	}
 
-	// Expedition specific buttons
 	Ship::ShipStates state = ship_.get_ship_state();
 	if (ship_.state_is_expedition()) {
 		/* The following rules apply:
@@ -243,9 +258,11 @@
 		btn_explore_island_ccw_->set_enabled(can_act && coast_nearby &&
 		                                     (state != Ship::ShipStates::kExpeditionColonizing));
 		btn_sink_->set_enabled(can_act && (state != Ship::ShipStates::kExpeditionColonizing));
-		btn_cancel_expedition_->set_enabled(can_act &&
-		                                    (state != Ship::ShipStates::kExpeditionColonizing));
 	}
+	btn_cancel_expedition_->set_enabled(ship_.state_is_expedition() && can_act &&
+	                                    (state != Ship::ShipStates::kExpeditionColonizing));
+	// Expedition specific buttons
+	set_button_visibility();
 }
 
 UI::Button* ShipWindow::make_button(UI::Panel* parent,

=== modified file 'src/wui/shipwindow.h'
--- src/wui/shipwindow.h	2017-02-21 20:38:33 +0000
+++ src/wui/shipwindow.h	2017-08-16 04:49:28 +0000
@@ -39,9 +39,6 @@
 	ShipWindow(InteractiveGameBase& igb, UI::UniqueWindow::Registry& reg, Widelands::Ship& ship);
 
 private:
-	// Resets the vbox_ and fills it with the currently needed buttons, then positions the window.
-	void init(bool avoid_fastclick);
-
 	void think() override;
 
 	UI::Button* make_button(UI::Panel* parent,
@@ -49,6 +46,7 @@
 	                        const std::string& title,
 	                        const std::string& picname,
 	                        boost::function<void()> callback);
+	void set_button_visibility();
 
 	void act_goto();
 	void act_destination();
@@ -62,7 +60,8 @@
 	InteractiveGameBase& igbase_;
 	Widelands::Ship& ship_;
 
-	std::unique_ptr<UI::Box> vbox_;
+	UI::Box vbox_;
+	UI::Box navigation_box_;
 	UI::Button* btn_goto_;
 	UI::Button* btn_destination_;
 	UI::Button* btn_sink_;
@@ -74,6 +73,7 @@
 	UI::Button* btn_scout_[Widelands::LAST_DIRECTION];
 	UI::Button* btn_construct_port_;
 	ItemWaresDisplay* display_;
+	int navigation_box_height_;
 	std::unique_ptr<Notifications::Subscriber<Widelands::NoteShipWindow>> shipnotes_subscriber_;
 	DISALLOW_COPY_AND_ASSIGN(ShipWindow);
 };