widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

I got an error running the Appveyor build - see screenshot: https://bugs.launchpad.net/widelands/+bug/1531114/comments/4

1 tiny code style consistency nit.

Diff comments:

> 
> === modified file 'src/wui/plot_area.cc'
> --- src/wui/plot_area.cc	2016-01-28 21:27:04 +0000
> +++ src/wui/plot_area.cc	2016-01-30 15:36:48 +0000
> @@ -225,15 +226,14 @@
>  	}
>  
>  	//  draw yticks, one at full, one at half
> -	dst.draw_line(Point(inner_w - space_at_right, spacing),
> -	              Point(inner_w - space_at_right - 3, spacing),
> -	              LINE_COLOR,
> -	              2);
> -	dst.draw_line(
> -	   Point(inner_w - space_at_right, spacing + ((inner_h - space_at_bottom) - spacing) / 2),
> -	   Point(inner_w - space_at_right - 3, spacing + ((inner_h - space_at_bottom) - spacing) / 2),
> -	   LINE_COLOR,
> -	   2);
> +	dst.draw_line_strip(LineStripMode::kOpen, {Point(inner_w - space_at_right, spacing),
> +	                                           Point(inner_w - space_at_right - 3, spacing)},
> +	                    kAxisLineColor, kAxisLinesWidth);
> +	dst.draw_line_strip(
> +		LineStripMode::kOpen, {
> +		Point(inner_w - space_at_right, spacing + ((inner_h - space_at_bottom) - spacing) / 2),
> +			Point(inner_w - space_at_right - 3, spacing + ((inner_h - space_at_bottom) - spacing) / 2),
> +		}, kAxisLineColor, kAxisLinesWidth);

Tiny nit: inconsistent formatting for the }, the other instances have this at the end of line.

If this was formatted by clang-format, leave it be.

>  
>  	//  print the used unit
>  	const Image* xtick = UI::g_fh1->render(xtick_text_style((boost::format(get_unit_name(unit)) % "").str()));


-- 
https://code.launchpad.net/~widelands-dev/widelands/beautiful_correct_lines/+merge/284517
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/beautiful_correct_lines into lp:widelands.