widelands

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

  1. do_not_update_size_when_minimized
  2. Merge into trunk
Proposed by SirVer
Status: Merged
Merged at revision: 7796
Proposed branch: lp:~widelands-dev/widelands/do_not_update_size_when_minimized
Merge into: lp:widelands
Diff against target: 20 lines (+2/-1)
1 file modified
src/ui_basic/window.cc (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/do_not_update_size_when_minimized
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+285277@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Bunnybot encountered an error while working on this merge proposal:

<urlopen error [Errno 110] Connection timed out>

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

review: Approve
Revision history for this message
SirVer (sirver) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui_basic/window.cc'
2--- src/ui_basic/window.cc 2016-02-03 18:09:15 +0000
3+++ src/ui_basic/window.cc 2016-02-07 05:54:54 +0000
4@@ -131,7 +131,7 @@
5 */
6 void Window::update_desired_size()
7 {
8- if (center_panel_) {
9+ if (center_panel_ && !_is_minimal) {
10 int innerw, innerh;
11 center_panel_->get_desired_size(&innerw, &innerh);
12 set_desired_size
13@@ -488,6 +488,7 @@
14 (get_lborder(), get_rborder(),
15 get_tborder(), BT_B_PIXMAP_THICKNESS);
16 set_inner_size(get_inner_w(), _oldh);
17+ update_desired_size();
18 move_inside_parent();
19 }
20 void Window::minimize() {

Subscribers

People subscribed via source and target branches

to status/vote changes: