Merge branch '1.12' of github.com:wesnoth/wesnoth into 1.12

Conflicts: changelog
wesnoth · Oct 5, 2014 · ce34356 · ce34356
2 parents 6dfcf27 + 396b435
commit ce34356
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/changelog b/changelog
@@ -40,6 +40,7 @@ Version 1.11.16+dev:
      where the Second Watch picture should be used instead.
    * Fixed mishandling of nested subnamespaces by the [clear_global_variable]
      WML action causing an assertion failure (bug #21093).
+   * In the dialog layout code, fixed the button padding.
 
 Version 1.11.16:
  * Add-ons client:

diff --git a/data/core/units/humans/Horse_Grand_Knight.cfg b/data/core/units/humans/Horse_Grand_Knight.cfg
@@ -4,6 +4,7 @@
     name= _ "Grand Knight"
     race=human
     image="units/human-loyalists/grand-knight/grand-knight.png"
+    image_icon="units/human-loyalists/grand-knight/grand-knight.png~CROP(11,9,72,72)"
     profile="portraits/humans/grand-knight.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     hitpoints=78

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