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

[ccawley2011]

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:
5c40b54694 DS: Always build without full detection features
e8c54ed7aa DS: Work around issues with GUI scaling at low resolutions


Commit: 5c40b546944ab601cbac315f538cc098e12dccd2
    https://github.com/scummvm/scummvm/commit/5c40b546944ab601cbac315f538cc098e12dccd2
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-20T17:42:28+01:00

Commit Message:
DS: Always build without full detection features

Changed paths:
    configure


diff --git a/configure b/configure
index d8b22ac6f5..91998ed316 100755
--- a/configure
+++ b/configure
@@ -3284,9 +3284,8 @@ if test -n "$_host"; then
 			if test "$_dynamic_modules" = yes ; then
 				_detection_features_static=no
 				_plugins_default=dynamic
-			else
-				_detection_features_full=no
 			fi
+			_detection_features_full=no
 			if test "$_debug_build" != yes; then
 				append_var DEFINES "-DDISABLE_TEXT_CONSOLE"
 			fi


Commit: e8c54ed7aad179d73005eb72bbbe664f9c2453a8
    https://github.com/scummvm/scummvm/commit/e8c54ed7aad179d73005eb72bbbe664f9c2453a8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-20T17:43:19+01:00

Commit Message:
DS: Work around issues with GUI scaling at low resolutions

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9bc0786ba0..47ec1cbb6e 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -118,6 +118,9 @@ void GuiManager::computeScaleFactor() {
 	_baseWidth = (int16)((float)w / _scaleFactor);
 
 	// Never go below 320x200. Our GUI layout is not designed to go below that.
+	// On the DS, this causes issues at 256x192 due to the use of non-scalable
+	// BDF fonts.
+#ifndef __DS__
 	if (_baseHeight < 200) {
 		_baseHeight = 200;
 		_scaleFactor = (float)h / (float)_baseHeight;
@@ -128,6 +131,7 @@ void GuiManager::computeScaleFactor() {
 		_scaleFactor = (float)w / (float)_baseWidth;
 		_baseHeight = (int16)((float)h / _scaleFactor);
 	}
+#endif
 
 	if (_theme)
 		_theme->setBaseResolution(_baseWidth, _baseHeight, _scaleFactor);