[Scummvm-git-logs] scummvm master -> d36016c9deb8daff57478c2a9b6fc17b32107812

[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:
f7a223c954 GRAPHICS: MACGUI: Added Manual Widnget draw mode
2d0ba5f544 DIRECTOR: Specify manual windget draw
d36016c9de GRAPHICS: MACGUI: Fix drawing empty maceditabletext


Commit: f7a223c954398f393b97ee1632392220fe210d30
    https://github.com/scummvm/scummvm/commit/f7a223c954398f393b97ee1632392220fe210d30
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-22T01:03:11+02:00

Commit Message:
GRAPHICS: MACGUI: Added Manual Widnget draw mode

Changed paths:
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 9ce4adb9db..2b5cab7d39 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -62,7 +62,8 @@ enum {
 	kWMModeAutohideMenu 	= (1 << 1),
 	kWMModalMenuMode 		= (1 << 2),
 	kWMModeForceBuiltinFonts= (1 << 3),
-	kWMModeUnicode			= (1 << 4)
+	kWMModeUnicode			= (1 << 4),
+	kWMModeManualDrawWidgets= (1 << 5)
 };
 
 }


Commit: 2d0ba5f544bbbb0fab1930c98112ad20b730dc63
    https://github.com/scummvm/scummvm/commit/2d0ba5f544bbbb0fab1930c98112ad20b730dc63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-22T01:04:46+02:00

Commit Message:
DIRECTOR: Specify manual windget draw

Changed paths:
    engines/pink/director.cpp


diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp
index 64c52d76a8..4d0382bb9d 100644
--- a/engines/pink/director.cpp
+++ b/engines/pink/director.cpp
@@ -92,7 +92,7 @@ Director::Director()
 	: _surface(640, 480), _textRendered(false) {
 	_wm = new Graphics::MacWindowManager(Graphics::kWMModeNoDesktop | Graphics::kWMModeAutohideMenu
 		| Graphics::kWMModalMenuMode | Graphics::kWMModeForceBuiltinFonts
-		| Graphics::kWMModeUnicode);
+		| Graphics::kWMModeUnicode | Graphics::kWMModeManualDrawWidgets);
 
 	_wm->setScreen(&_surface);
 	_wm->setMenuHotzone(Common::Rect(0, 0, 640, 23));


Commit: d36016c9deb8daff57478c2a9b6fc17b32107812
    https://github.com/scummvm/scummvm/commit/d36016c9deb8daff57478c2a9b6fc17b32107812
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-22T01:09:01+02:00

Commit Message:
GRAPHICS: MACGUI: Fix drawing empty maceditabletext

Changed paths:
    graphics/macgui/maceditabletext.cpp


diff --git a/graphics/macgui/maceditabletext.cpp b/graphics/macgui/maceditabletext.cpp
index c4c23e2309..43c32171bf 100644
--- a/graphics/macgui/maceditabletext.cpp
+++ b/graphics/macgui/maceditabletext.cpp
@@ -166,7 +166,7 @@ bool MacEditableText::draw(bool forceRedraw) {
 	_contentIsDirty = false;
 
 	// Compose
-	MacText::draw(&_composeSurface, 0, _scrollPos, _surface->w - 2, _scrollPos + _surface->h - 2, kConWOverlap - 2, kConWOverlap - 2);
+	MacText::draw(&_composeSurface, 0, _scrollPos, _surface->w, _scrollPos + _surface->h, kConWOverlap - 2, kConWOverlap - 2);
 
 	if (_cursorState)
 		_composeSurface.blitFrom(*_cursorSurface, *_cursorRect, Common::Point(_cursorX + kConWOverlap - 2, _cursorY + kConHOverlap - 2));