[Scummvm-git-logs] scummvm master -> 1b3915f2227953b8796fb40dd8e1347c3f66db7c

[SupSuper]

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:
49dce75a51 GUI: Default new widgets to useRTL = true
6d32568656 SCI: Add RTL support to Engine options tab
1b3915f222 MOHAWK: Add RTL support to Engine options tab


Commit: 49dce75a51b29091cda1d462707cdc46fbd0c837
    https://github.com/scummvm/scummvm/commit/49dce75a51b29091cda1d462707cdc46fbd0c837
Author: SupSuper (supsuper at gmail.com)
Date: 2021-01-28T13:14:51Z

Commit Message:
GUI: Default new widgets to useRTL = true

This corrects the RTL layout of widgets created in code
such as engine options.

Changed paths:
    gui/ThemeEval.h


diff --git a/gui/ThemeEval.h b/gui/ThemeEval.h
index c4158e5edd..26803ebb91 100644
--- a/gui/ThemeEval.h
+++ b/gui/ThemeEval.h
@@ -76,7 +76,7 @@ public:
 
 	ThemeEval &addDialog(const Common::String &name, const Common::String &overlays, int16 maxWidth = -1, int16 maxHeight = -1, int inset = 0);
 	ThemeEval &addLayout(ThemeLayout::LayoutType type, int spacing = -1, ThemeLayout::ItemAlign itemAlign = ThemeLayout::kItemAlignStart);
-	ThemeEval &addWidget(const Common::String &name, const Common::String &type, int w = -1, int h = -1, Graphics::TextAlign align = Graphics::kTextAlignStart, bool useRTL = false);
+	ThemeEval &addWidget(const Common::String &name, const Common::String &type, int w = -1, int h = -1, Graphics::TextAlign align = Graphics::kTextAlignStart, bool useRTL = true);
 	ThemeEval &addImportedLayout(const Common::String &name);
 	ThemeEval &addSpace(int size = -1);
 


Commit: 6d32568656ea4b985fab9af18e2bd38374eb1f73
    https://github.com/scummvm/scummvm/commit/6d32568656ea4b985fab9af18e2bd38374eb1f73
Author: SupSuper (supsuper at gmail.com)
Date: 2021-01-28T13:14:51Z

Commit Message:
SCI: Add RTL support to Engine options tab

Options dialogs need to be named "GameOptions"
to be properly laid out in RTL.

Changed paths:
    engines/sci/detection.cpp


diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index eecb9dbaf2..0de4fb193a 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -362,7 +362,7 @@ private:
 };
 
 OptionsWidget::OptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
-		OptionsContainerWidget(boss, name, "SciOptionsDialog", false, domain) {
+		OptionsContainerWidget(boss, name, "SciGameOptionsDialog", false, domain) {
 	_guiOptions = ConfMan.get("guioptions", domain);
 
 	for (const ADExtraGuiOptionsMap *entry = optionsList; entry->guioFlag; ++entry)


Commit: 1b3915f2227953b8796fb40dd8e1347c3f66db7c
    https://github.com/scummvm/scummvm/commit/1b3915f2227953b8796fb40dd8e1347c3f66db7c
Author: SupSuper (supsuper at gmail.com)
Date: 2021-01-28T13:14:51Z

Commit Message:
MOHAWK: Add RTL support to Engine options tab

Options dialogs need to be named "GameOptions"
to be properly laid out in RTL.

Changed paths:
    engines/mohawk/dialogs.cpp


diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index 982406bc17..a70ea67281 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -95,7 +95,7 @@ enum {
 #ifdef ENABLE_MYST
 
 MystOptionsWidget::MystOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
-		OptionsContainerWidget(boss, name, "MystOptionsDialog", false, domain),
+		OptionsContainerWidget(boss, name, "MystGameOptionsDialog", false, domain),
 		_zipModeCheckbox(nullptr),
 		_transitionsCheckbox(nullptr),
 		_mystFlyByCheckbox(nullptr),
@@ -109,13 +109,13 @@ MystOptionsWidget::MystOptionsWidget(GuiObject *boss, const Common::String &name
 
 	if (!isDemo) {
 		// I18N: Option for fast scene switching
-		_zipModeCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystOptionsDialog.ZipMode", _("~Z~ip Mode Activated"));
+		_zipModeCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystGameOptionsDialog.ZipMode", _("~Z~ip Mode Activated"));
 	}
 
-	_transitionsCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystOptionsDialog.Transistions", _("~T~ransitions Enabled"));
+	_transitionsCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystGameOptionsDialog.Transistions", _("~T~ransitions Enabled"));
 
 	if (isME) {
-		_mystFlyByCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystOptionsDialog.PlayMystFlyBy", _("Play the Myst fly by movie"),
+		_mystFlyByCheckbox = new GUI::CheckboxWidget(widgetsBoss(), "MystGameOptionsDialog.PlayMystFlyBy", _("Play the Myst fly by movie"),
 		                                             _("The Myst fly by movie was not played by the original engine."));
 	}
 
@@ -124,23 +124,23 @@ MystOptionsWidget::MystOptionsWidget(GuiObject *boss, const Common::String &name
 		assert(vm);
 
 		// I18N: Drop book page
-		_dropPageButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.DropPage", _("~D~rop Page"), Common::U32String(), kDropCmd);
+		_dropPageButton = new GUI::ButtonWidget(widgetsBoss(), "MystGameOptionsDialog.DropPage", _("~D~rop Page"), Common::U32String(), kDropCmd);
 
 		// Myst ME only has maps
 		if (vm->isGameVariant(GF_ME)) {
-			_showMapButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.ShowMap", _("Show ~M~ap"), Common::U32String(), kMapCmd);
+			_showMapButton = new GUI::ButtonWidget(widgetsBoss(), "MystGameOptionsDialog.ShowMap", _("Show ~M~ap"), Common::U32String(), kMapCmd);
 		}
 
 		// Myst demo only has a menu
 		if (vm->isGameVariant(GF_DEMO)) {
-			_returnToMenuButton = new GUI::ButtonWidget(widgetsBoss(), "MystOptionsDialog.MainMenu", _("Main Men~u~"), Common::U32String(), kMenuCmd);
+			_returnToMenuButton = new GUI::ButtonWidget(widgetsBoss(), "MystGameOptionsDialog.MainMenu", _("Main Men~u~"), Common::U32String(), kMenuCmd);
 		}
 
 		if (vm->isGameVariant(GF_25TH)) {
-			GUI::StaticTextWidget *languageCaption = new GUI::StaticTextWidget(widgetsBoss(), "MystOptionsDialog.LanguageDesc", _("Language:"));
+			GUI::StaticTextWidget *languageCaption = new GUI::StaticTextWidget(widgetsBoss(), "MystGameOptionsDialog.LanguageDesc", _("Language:"));
 			languageCaption->setAlign(Graphics::kTextAlignRight);
 
-			_languagePopUp = new GUI::PopUpWidget(widgetsBoss(), "MystOptionsDialog.Language");
+			_languagePopUp = new GUI::PopUpWidget(widgetsBoss(), "MystGameOptionsDialog.Language");
 
 			const MystLanguage *languages = MohawkMetaEngine_Myst::listLanguages();
 			while (languages->language != Common::UNK_LANG) {