[Scummvm-git-logs] scummvm master -> 9d2ca34ae4e7ae710e51edb4259006caf211de5b

[sev-]

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

Summary:
5091968f4c GRAPHICS: MACGUI: More work on clearing MacTextWindow content
a00ca84bdb WAGE: Implement Gui::clearOutput()
9d2ca34ae4 GRAPHICS: MACGUI: Enforce surface cleanup on MacText clearing


Commit: 5091968f4c3ab927f2621d06fc2d064311fff8fa
    https://github.com/scummvm/scummvm/commit/5091968f4c3ab927f2621d06fc2d064311fff8fa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-05T23:50:45+02:00

Commit Message:
GRAPHICS: MACGUI: More work on clearing MacTextWindow content

Changed paths:
    graphics/macgui/mactext.cpp
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 551dead..04a0e90 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -417,6 +417,8 @@ void MacText::clearText() {
 	_str.clear();
 
 	recalcDims();
+
+	render();
 }
 
 void MacText::replaceLastLine(Common::String str) {
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 22731b7..ffb72d9 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -98,6 +98,7 @@ void MacTextWindow::clearText() {
 	_mactext->clearText();
 
 	_contentIsDirty = true;
+	_borderIsDirty = true;
 
 	updateCursorPos();
 }


Commit: a00ca84bdb2f5b69f5c620fcb1fe1a13c2bfba32
    https://github.com/scummvm/scummvm/commit/a00ca84bdb2f5b69f5c620fcb1fe1a13c2bfba32
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-05T23:50:45+02:00

Commit Message:
WAGE: Implement Gui::clearOutput()

Changed paths:
    engines/wage/gui.cpp


diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp
index d8ac5d4..8bda5d3 100644
--- a/engines/wage/gui.cpp
+++ b/engines/wage/gui.cpp
@@ -330,8 +330,7 @@ void Gui::appendText(const char *s) {
 }
 
 void Gui::clearOutput() {
-	//_consoleWindow->clearAllContent();
-	warning("STUB: Gui::clearOutput()");
+	_consoleWindow->clearText();
 }
 
 void Gui::actionCopy() {


Commit: 9d2ca34ae4e7ae710e51edb4259006caf211de5b
    https://github.com/scummvm/scummvm/commit/9d2ca34ae4e7ae710e51edb4259006caf211de5b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-05T23:55:44+02:00

Commit Message:
GRAPHICS: MACGUI: Enforce surface cleanup on MacText clearing

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 04a0e90..d7c3795 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -416,9 +416,9 @@ void MacText::clearText() {
 	_textLines.clear();
 	_str.clear();
 
-	recalcDims();
+	_surface->clear(_bgcolor);
 
-	render();
+	recalcDims();
 }
 
 void MacText::replaceLastLine(Common::String str) {