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

[sev-]

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:
851b0c5edc GUI: Add lowres support for the renderer dropdown
aafbc1b3e3 Increased OptionsLabel's width to allow for the 3D Game Renderer


Commit: 851b0c5edc975dbeb5b74ea082d6f9e6df485d4d
    https://github.com/scummvm/scummvm/commit/851b0c5edc975dbeb5b74ea082d6f9e6df485d4d
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-03-26T15:34:22+01:00

Commit Message:
GUI: Add lowres support for the renderer dropdown

Changed paths:
    graphics/renderer.cpp
    gui/options.cpp


diff --git a/graphics/renderer.cpp b/graphics/renderer.cpp
index ea74acefcc..6c5f5e7682 100644
--- a/graphics/renderer.cpp
+++ b/graphics/renderer.cpp
@@ -39,6 +39,8 @@ static const RendererTypeDescription rendererTypes[] = {
 	{ 0, 0, kRendererTypeDefault }
 };
 
+DECLARE_TRANSLATION_ADDITIONAL_CONTEXT("OpenGL with shaders", "lowres")
+
 const RendererTypeDescription *listRendererTypes() {
 	return rendererTypes;
 }
diff --git a/gui/options.cpp b/gui/options.cpp
index cf09c5543b..f7078d5a6f 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1325,13 +1325,20 @@ void OptionsDialog::addGraphicControls(GuiObject *boss, const Common::String &pr
 
 	_vsyncCheckbox = new CheckboxWidget(boss, prefix + "grVSyncCheckbox", _("V-Sync in 3D Games"), _("Wait for the vertical sync to refresh the screen in 3D renderer"));
 
-	_rendererTypePopUpDesc = new StaticTextWidget(boss, prefix + "grRendererTypePopupDesc", _("Game 3D Renderer:"));
+	if (g_system->getOverlayWidth() > 320)
+		_rendererTypePopUpDesc = new StaticTextWidget(boss, prefix + "grRendererTypePopupDesc", _("Game 3D Renderer:"));
+	else
+		_rendererTypePopUpDesc = new StaticTextWidget(boss, prefix + "grRendererTypePopupDesc", _c("Game 3D Renderer:", "lowres"));
+
 	_rendererTypePopUp = new PopUpWidget(boss, prefix + "grRendererTypePopup");
 	_rendererTypePopUp->appendEntry(_("<default>"), Graphics::kRendererTypeDefault);
 	_rendererTypePopUp->appendEntry("");
 	const Graphics::RendererTypeDescription *rt = Graphics::listRendererTypes();
 	for (; rt->code; ++rt) {
-		_rendererTypePopUp->appendEntry(_(rt->description), rt->id);
+		if (g_system->getOverlayWidth() > 320)
+			_rendererTypePopUp->appendEntry(_(rt->description), rt->id);
+		else
+			_rendererTypePopUp->appendEntry(_c(rt->description, "lowres"), rt->id);
 	}
 
 	_antiAliasPopUpDesc = new StaticTextWidget(boss, prefix + "grAntiAliasPopupDesc", _("3D Anti-aliasing:"));


Commit: aafbc1b3e3891da8589495adafed85e893c52536
    https://github.com/scummvm/scummvm/commit/aafbc1b3e3891da8589495adafed85e893c52536
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-03-26T15:34:22+01:00

Commit Message:
Increased OptionsLabel's width to allow for the 3D Game Renderer
description

Changed paths:
    gui/themes/default.inc
    gui/themes/scummclassic.zip
    gui/themes/scummclassic/classic_layout.stx
    gui/themes/scummclassic/classic_layout_lowres.stx


diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ca587c6222..308617fef9 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1437,7 +1437,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "<def var='Predictive.ShowDeletePic' value='0'/>"
 "<def var='DropdownButton.Width' value='17'/>"
 "<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
+"size='120,Globals.Line.Height' "
 "textalign='end' "
 "/>"
 "<widget name='SmallLabel' "
@@ -3300,7 +3300,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "size='85,12' "
 "/>"
 "<widget name='OptionsLabel' "
-"size='110,Globals.Line.Height' "
+"size='120,Globals.Line.Height' "
 "textalign='end' "
 "/>"
 "<widget name='SmallLabel' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 4a345381eb..c3b337d2b3 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index e3920f9652..acfa45aa49 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -54,7 +54,7 @@
 		<def var = 'DropdownButton.Width' value = '17'/>
 
 		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
+				size = '120, Globals.Line.Height'
 				textalign = 'end'
 		/>
 		<widget name = 'SmallLabel'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 2da592ecc8..2341550296 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -67,7 +67,7 @@
 		/>
 
 		<widget name = 'OptionsLabel'
-				size = '110, Globals.Line.Height'
+				size = '120, Globals.Line.Height'
 				textalign = 'end'
 		/>
 		<widget name = 'SmallLabel'