[Scummvm-cvs-logs] scummvm master -> da790e112ca1a1de5730713cad1871917d52c781

[lordhoto]

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:
9ba145419f GUI: Mark parts of the grid based chooser layout code as HACK.
da790e112c GUI: Create the builtin theme from scummclassic again.


Commit: 9ba145419faa46b85baf5982f0c62ab76268b0af
    https://github.com/scummvm/scummvm/commit/9ba145419faa46b85baf5982f0c62ab76268b0af
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-12T06:16:27-07:00

Commit Message:
GUI: Mark parts of the grid based chooser layout code as HACK.

Changed paths:
    gui/saveload-dialog.cpp



diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp
index 8e214bc..d1a66dc 100644
--- a/gui/saveload-dialog.cpp
+++ b/gui/saveload-dialog.cpp
@@ -620,6 +620,8 @@ void SaveLoadChooserGrid::open() {
 }
 
 void SaveLoadChooserGrid::reflowLayout() {
+	// HACK: The page display is not available in low resolution layout. We
+	// remove and readd the widget here to avoid our GUI from erroring out.
 	removeWidget(_pageDisplay);
 	if (g_gui.xmlEval()->getVar("Globals.ShowChooserPageDisplay") == 1) {
 		_pageDisplay->init();
@@ -628,6 +630,8 @@ void SaveLoadChooserGrid::reflowLayout() {
 	SaveLoadChooserDialog::reflowLayout();
 	destroyButtons();
 
+	// HACK: The whole code below really works around the fact, that we have
+	// no easy way to dynamically layout widgets.
 	const uint16 availableWidth = getWidth() - 20;
 	uint16 availableHeight;
 


Commit: da790e112ca1a1de5730713cad1871917d52c781
    https://github.com/scummvm/scummvm/commit/da790e112ca1a1de5730713cad1871917d52c781
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-12T06:18:09-07:00

Commit Message:
GUI: Create the builtin theme from scummclassic again.

The old builtin one actually was based on a unpublished version, which failed
with the current code. Oops.

Changed paths:
    gui/themes/default.inc



diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index bfd78db..7f565eb 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1399,7 +1399,6 @@
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<space/> "
 "<widget name='Ok' "
 "type='Button' "
 "/> "
@@ -2379,7 +2378,7 @@
 "<widget name='Cancel' "
 "type='Button' "
 "/> "
-"<space/> "
+"<space size='96'/> "
 "<widget name='Ok' "
 "type='Button' "
 "/> "