widelands-dev team mailing list archive

[Klaus Halfmann <klaus.halfmann@xxxxxxxx>]

Review: Approve code review

OK found no obvious code flaws, 
I played this in several config for some time withou any harm.

@bunnybot merge

Diff comments:

> 
> === modified file 'src/ui_basic/panel.h'
> --- src/ui_basic/panel.h	2017-01-25 18:55:59 +0000
> +++ src/ui_basic/panel.h	2017-03-02 08:46:01 +0000
> @@ -180,14 +180,8 @@
>  		return bborder_;
>  	}
>  
> -	int get_inner_w() const {
> -		assert(lborder_ + rborder_ <= w_);
> -		return w_ - (lborder_ + rborder_);
> -	}
> -	int get_inner_h() const {
> -		assert(tborder_ + bborder_ <= h_);
> -		return h_ - (tborder_ + bborder_);
> -	}
> +	int get_inner_w() const;
> +	int get_inner_h() const;

Yes, better do not make this inline.

>  
>  	const Panel* get_next_sibling() const {
>  		return next_;
> 
> === modified file 'src/ui_fsmenu/loadgame.cc'
> --- src/ui_fsmenu/loadgame.cc	2017-02-26 11:57:15 +0000
> +++ src/ui_fsmenu/loadgame.cc	2017-03-02 08:46:01 +0000
> @@ -188,6 +188,7 @@
>  		ta_mapname_.set_tooltip(_("The map that this game is based on"));
>  		delete_.set_tooltip(_("Delete this game"));
>  	}
> +	set_thinks(false);

Waht is improved here? No need fo the loadgame to think?

>  	minimap_icon_.set_visible(false);
>  
>  	back_.sigclicked.connect(boost::bind(&FullscreenMenuLoadGame::clicked_back, boost::ref(*this)));


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1653460-panel-init-width/+merge/318358
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1653460-panel-init-width.