[Scummvm-git-logs] scummvm master -> 6c36f4b5503e1036dbcc4a8183624f9621c0143f

[sev-]

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:
1dd056b689 MACGUI: Do not assert when recalculating boards on loading
6c36f4b550 WAGE: Reenabled 9-patch border drawing and added default border images


Commit: 1dd056b6899e753eeec4cf4946857d2199734c20
    https://github.com/scummvm/scummvm/commit/1dd056b6899e753eeec4cf4946857d2199734c20
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-28T01:29:35+02:00

Commit Message:
MACGUI: Do not assert when recalculating boards on loading

Changed paths:
    graphics/macgui/macwindow.cpp


diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index a64cc88..08343c0 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -172,6 +172,9 @@ static void drawPixelInverted(int x, int y, int color, void *data) {
 }
 
 void MacWindow::updateInnerDims() {
+	if (_dims.isEmpty())
+		return;
+
 	if (_macBorder.hasBorder(_active) && _macBorder.hasOffsets()) {
 		_innerDims = Common::Rect(
 			_dims.left + _macBorder.getOffset(kBorderOffsetLeft),


Commit: 6c36f4b5503e1036dbcc4a8183624f9621c0143f
    https://github.com/scummvm/scummvm/commit/6c36f4b5503e1036dbcc4a8183624f9621c0143f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-28T01:29:35+02:00

Commit Message:
WAGE: Reenabled 9-patch border drawing and added default border images

Changed paths:
  A devtools/create_wage/wage_border_act.bmp
  A devtools/create_wage/wage_border_inact.bmp
    engines/wage/gui.cpp


diff --git a/devtools/create_wage/wage_border_act.bmp b/devtools/create_wage/wage_border_act.bmp
new file mode 100644
index 0000000..a1247bb
Binary files /dev/null and b/devtools/create_wage/wage_border_act.bmp differ
diff --git a/devtools/create_wage/wage_border_inact.bmp b/devtools/create_wage/wage_border_inact.bmp
new file mode 100644
index 0000000..3851833
Binary files /dev/null and b/devtools/create_wage/wage_border_inact.bmp differ
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index 609fe35..c22f05a 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -309,8 +309,8 @@ void Gui::executeMenuCommand(int action, Common::String &text) {
 
 void Gui::loadBorders() {
 	// Do not load borders for now
-	//loadBorder(_sceneWindow, "border_inac.bmp", false);
-	//loadBorder(_sceneWindow, "border_act.bmp", true);
+	loadBorder(_sceneWindow, "wage_border_inact.bmp", false);
+	loadBorder(_sceneWindow, "wage_border_act.bmp", true);
 }
 
 void Gui::loadBorder(Graphics::MacWindow *target, Common::String filename, bool active) {
@@ -325,7 +325,7 @@ void Gui::loadBorder(Graphics::MacWindow *target, Common::String filename, bool
 	Common::SeekableReadStream *stream = borderfile.readStream(borderfile.size());
 	if (stream) {
 
-		target->loadBorder(*stream, active, 10, 10, 1, 1);
+		target->loadBorder(*stream, active, 18, 18, 18, 18);
 
 		borderfile.close();