0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'LovCAPONE/TopButtonStatsCutOff'

Browse source 
Conflicts:
	changelog
This commit is contained in:
Chris Beck 2014-10-04 09:30:53 -04:00
commit ffa887f61c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -120,6 +120,7 @@ Version 1.13.0-dev:
* Added new wml attributes to listbox: has_minimum and has_maximum.
* Added a "Disable automatic moves" preference to disable automatic movements
at the begining of a turn.
* In the dialog layout code, fixed the button padding.
* WML engine:
* Added customizable recall costs for unit types and individual units,
using the new recall_cost attribute in [unit_type] and [unit].

2
src/construct_dialog.cpp
View file

@ -626,7 +626,7 @@ dialog::dimension_measurements dialog::layout(int xloc, int yloc)
}
}
const int text_widget_y = dim.y+top_padding+text_and_image_height-6+menu_hpadding;
const int text_widget_y = dim.y + top_padding + text_and_image_height - (text_and_image_height > 0 ? 6 : 0) + menu_hpadding;
if(use_textbox) {
dim.textbox.x = dim.x + left_padding + text_widget_width - dim.textbox.w;