Merge remote-tracking branch 'LovCAPONE/TopButtonStatsCutOff'

Conflicts: changelog
wesnoth · Oct 4, 2014 · ffa887f · ffa887f
2 parents d5de2bf + 1f30e6d
commit ffa887f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog b/changelog
@@ -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].

diff --git a/src/construct_dialog.cpp b/src/construct_dialog.cpp
@@ -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;