[Scummvm-git-logs] scummvm master -> 11e0c9571eb3d9de68cd09a2b888896be2a26817

sev- sev at scummvm.org
Mon Sep 30 23:46:38 CEST 2019


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

Summary:
11e0c9571e PINK: Use proper window border for PDA


Commit: 11e0c9571eb3d9de68cd09a2b888896be2a26817
    https://github.com/scummvm/scummvm/commit/11e0c9571eb3d9de68cd09a2b888896be2a26817
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-30T23:46:25+02:00

Commit Message:
PINK: Use proper window border for PDA

Changed paths:
  A devtools/create_pink/ScrollbarOnlyWin95active.bmp
  A devtools/create_pink/ScrollbarOnlyWin95inactive.bmp
    engines/pink/objects/actions/action_text.cpp


diff --git a/devtools/create_pink/ScrollbarOnlyWin95active.bmp b/devtools/create_pink/ScrollbarOnlyWin95active.bmp
new file mode 100644
index 0000000..e52606f
Binary files /dev/null and b/devtools/create_pink/ScrollbarOnlyWin95active.bmp differ
diff --git a/devtools/create_pink/ScrollbarOnlyWin95inactive.bmp b/devtools/create_pink/ScrollbarOnlyWin95inactive.bmp
new file mode 100644
index 0000000..75ac5c9
Binary files /dev/null and b/devtools/create_pink/ScrollbarOnlyWin95inactive.bmp differ
diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index a5b97b1..0b2e886 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -90,6 +90,20 @@ void ActionText::start() {
 		_txtWnd->move(_xLeft, _yTop);
 		_txtWnd->resize(_xRight - _xLeft, _yBottom - _yTop);
 
+		Common::File f;
+
+		f.open("ScrollbarOnlyWin95active.bmp");
+		if (f.isOpen()) {
+			_txtWnd->loadBorder(f, true);
+			f.close();
+		}
+
+		f.open("ScrollbarOnlyWin95inactive.bmp");
+		if (f.isOpen()) {
+			_txtWnd->loadBorder(f, false);
+			f.close();
+		}
+
 		if (_actor->getPage()->getGame()->getLanguage() == Common::EN_ANY)
 			_txtWnd->appendText(str, font);
 	} else {





More information about the Scummvm-git-logs mailing list