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

[antoniou79]

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:
6ab16e6ea9 ANDROID: Fix build after PR #3264


Commit: 6ab16e6ea9b11e442fbdfeb2bce9ceacb3c4a2dd
    https://github.com/scummvm/scummvm/commit/6ab16e6ea9b11e442fbdfeb2bce9ceacb3c4a2dd
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2021-08-14T10:39:04+03:00

Commit Message:
ANDROID: Fix build after PR #3264

And set default scale to 0 (very large) for now

Changed paths:
    backends/platform/android/android.cpp


diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 950e666e54..7013cfb3d0 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -400,6 +400,14 @@ void OSystem_Android::initBackend() {
 		ConfMan.set("browser_lastpath", "/");
 	}
 
+	if (!ConfMan.hasKey("gui_scale")) {
+		// Until a proper scale detection is done (especially post PR https://github.com/scummvm/scummvm/pull/3264/commits/8646dfca329b6fbfdba65e0dc0802feb1382dab2),
+		// set scale by default to largest, if not set, and then let the user set it manually from the launcher -> Options -> Misc tab
+		// Otherwise the screen may default to very tiny and indiscernible text and be barely usable.
+		// TODO We need a proper scale detection for Android, see: (float) AndroidGraphicsManager::getHiDPIScreenFactor() in android/graphics.cpp
+		ConfMan.setInt("gui_scale", 0); // "Very large" (see gui/options.cpp)
+	}
+
 	// BUG: "transient" ConfMan settings get nuked by the options
 	// screen. Passing the savepath in this way makes it stick
 	// (via ConfMan.registerDefault() which is called from DefaultSaveFileManager constructor (backends/saves/default/default-saves.cpp))
@@ -476,8 +484,6 @@ bool OSystem_Android::getFeatureState(Feature f) {
 	switch (f) {
 	case kFeatureVirtualKeyboard:
 		return _virtkeybd_on;
-	case OSystem::kFeatureHiDPI:
-		return true;
 	default:
 		return ModularGraphicsBackend::getFeatureState(f);
 	}