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

Merge branch 'master' of https://github.com/wesnoth/wesnoth

Browse source
This commit is contained in:
Chris Beck 2014-11-10 21:26:17 -05:00
commit 08e61a10bb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog
View file

@ -159,7 +159,8 @@ 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 (bug #22379).
* Fixed lower button row padding for GUI1 dialogs including Statistics and
the Add-ons Manager (bugs #22379, #22791).
* Fixed mouse tracking issue with workaround by changing the default window
resolution for OS X to 800 x 600 (bug #20332).
* Removed the "Replay viewer" text label from the replay controller theme,

4
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 - (text_and_image_height > 0 ? 6 : 0) + menu_hpadding;
const int text_widget_y = dim.y + top_padding + text_and_image_height - 6 + menu_hpadding;
if(use_textbox) {
dim.textbox.x = dim.x + left_padding + text_widget_width - dim.textbox.w;
@ -677,7 +677,7 @@ dialog::dimension_measurements dialog::layout(int xloc, int yloc)
//set the position of any tick boxes. by default, they go right below the menu,
//slammed against the right side of the dialog
if(extra_buttons_.empty() == false) {
int options_y = text_widget_y + top_widgets_height + menu_->height() + button_height_padding + menu_hpadding;
int options_y = dim.menu_y + menu_->height() + menu_hpadding + button_height_padding;
int options_left_y = options_y;
for(button_pool_const_iterator b = button_pool_.begin(); b != button_pool_.end(); ++b) {
dialog_button const *const btn = b->first;