[Scummvm-cvs-logs] scummvm master -> 17d7f3bf284bc7fb94bf049120f0cf07e2ff5fee

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dd3e877b14 GUI: Fix for bug 6719 (last line of help missing)
17d7f3bf28 Merge pull request #503 from BenCastricum/fixforbug6719


Commit: dd3e877b144a514fe2c93a253c40a3c47345806d
    https://github.com/scummvm/scummvm/commit/dd3e877b144a514fe2c93a253c40a3c47345806d
Author: Ben Castricum (github at bencastricum.nl)
Date: 2014-10-18T15:08:20+02:00

Commit Message:
GUI: Fix for bug 6719 (last line of help missing)

Since 1.4 the font changed from a 14 to 15 pixel height wich causes
one line of help text no longer to be shown. By changing the padding
of the buttons the last lines fits again.

Changed paths:
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_layout.stx



diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index e40e8b1..c7c5856 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index b760e15..7e61d68 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -1169,9 +1169,9 @@
 					height = 'Globals.Line.Height'
 			/>
 			<widget name = 'HelpText'
-					height = '220'
+					height = '228'
 			/>
-			<layout type = 'horizontal' padding = '0, 0, 16, 0'>
+			<layout type = 'horizontal' padding = '0, 0, 8, 0'>
 				<widget name = 'Prev'
 						type = 'Button'
 				/>


Commit: 17d7f3bf284bc7fb94bf049120f0cf07e2ff5fee
    https://github.com/scummvm/scummvm/commit/17d7f3bf284bc7fb94bf049120f0cf07e2ff5fee
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-10-27T01:46:38+02:00

Commit Message:
Merge pull request #503 from BenCastricum/fixforbug6719

GUI: Fix for bug 6719 (last line of help missing)

Changed paths:
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_layout.stx