Merge lp:~widelands-dev/widelands/do_not_update_size_when_minimized into lp:widelands

[SirVer]

Windows should not update their size when minimized, but instead when they get restored.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

<urlopen error [Errno 110] Connection timed out>

[GunChleoc (gunchleoc)]

LGTM :)

review: Approve

[SirVer (sirver)]

@bunnybot merge

=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2016-02-03 18:09:15 +0000
+++ src/ui_basic/window.cc	2016-02-07 05:54:54 +0000
@@ -131,7 +131,7 @@
  */
 void Window::update_desired_size()
 {
-	if (center_panel_) {
+	if (center_panel_ && !_is_minimal) {
 		int innerw, innerh;
 		center_panel_->get_desired_size(&innerw, &innerh);
 		set_desired_size
@@ -488,6 +488,7 @@
 		(get_lborder(), get_rborder(),
 		 get_tborder(), BT_B_PIXMAP_THICKNESS);
 	set_inner_size(get_inner_w(), _oldh);
+	update_desired_size();
 	move_inside_parent();
 }
 void Window::minimize() {