[Scummvm-git-logs] scummvm master -> 51867690c44955822823ac9a3192007c9731fd35
eriktorbjorn
noreply at scummvm.org
Wed Mar 9 07:56:16 UTC 2022
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:
fe09c9ad4f SCUMM: Rename EGA Loom settings elements
51867690c4 SCUMM: Fix EGA Loom options in RTL mode
Commit: fe09c9ad4f66df45909c38e46d81780f0ec6edf0
https://github.com/scummvm/scummvm/commit/fe09c9ad4f66df45909c38e46d81780f0ec6edf0
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-09T08:35:22+01:00
Commit Message:
SCUMM: Rename EGA Loom settings elements
Because if I constantly have to double-check which is which, even though
there are only three of them, I clearly made a mistake when I first
named them.
Changed paths:
engines/scumm/dialogs.cpp
engines/scumm/dialogs.h
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index ffbfb389b82..19c8cb6fcbe 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -701,7 +701,7 @@ void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32
LoomEgaOptionsWidget::LoomEgaOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
OptionsContainerWidget(boss, name, "LoomEgaOptionsDialog", false, domain) {
- GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksHeader", _("Overture Timing:"));
+ GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksLabel", _("Overture Timing:"));
text->setAlign(Graphics::TextAlign::kTextAlignEnd);
@@ -719,9 +719,9 @@ LoomEgaOptionsWidget::LoomEgaOptionsWidget(GuiObject *boss, const Common::String
_overtureTicksSlider->setMinValue(-160);
_overtureTicksSlider->setMaxValue(540);
- _overtureTicksLabel = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksLabel", Common::U32String());
+ _overtureTicksValue = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksValue", Common::U32String());
- _overtureTicksLabel->setFlags(GUI::WIDGET_CLEARBG);
+ _overtureTicksValue->setFlags(GUI::WIDGET_CLEARBG);
}
void LoomEgaOptionsWidget::load() {
@@ -731,7 +731,7 @@ void LoomEgaOptionsWidget::load() {
loomOvertureTicks = ConfMan.getInt("loom_overture_ticks", _domain);
_overtureTicksSlider->setValue(loomOvertureTicks);
- updateOvertureTicksLabel();
+ updateOvertureTicksValue();
}
bool LoomEgaOptionsWidget::save() {
@@ -743,9 +743,9 @@ void LoomEgaOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::S
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutHorizontal, 12)
.addPadding(0, 0, 16, 0)
- .addWidget("OvertureTicksHeader", "OptionsLabel")
+ .addWidget("OvertureTicksLabel", "OptionsLabel")
.addWidget("OvertureTicks", "WideSlider")
- .addWidget("OvertureTicksLabel", "ShortOptionsLabel")
+ .addWidget("OvertureTicksValue", "ShortOptionsLabel")
.closeLayout()
.closeDialog();
}
@@ -754,7 +754,7 @@ void LoomEgaOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd,
switch (cmd) {
case kOvertureTicksChanged:
- updateOvertureTicksLabel();
+ updateOvertureTicksValue();
break;
default:
GUI::OptionsContainerWidget::handleCommand(sender, cmd, data);
@@ -762,10 +762,10 @@ void LoomEgaOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd,
}
}
-void LoomEgaOptionsWidget::updateOvertureTicksLabel() {
+void LoomEgaOptionsWidget::updateOvertureTicksValue() {
int ticks = DEFAULT_LOOM_OVERTURE_TRANSITION + _overtureTicksSlider->getValue();
- _overtureTicksLabel->setLabel(Common::String::format("%d:%02d.%d", ticks / 600, (ticks % 600) / 10, ticks % 10));
+ _overtureTicksValue->setLabel(Common::String::format("%d:%02d.%d", ticks / 600, (ticks % 600) / 10, ticks % 10));
}
} // End of namespace Scumm
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 9ce147cd798..c039b3b0df0 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -229,9 +229,9 @@ private:
void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
GUI::SliderWidget *_overtureTicksSlider;
- GUI::StaticTextWidget *_overtureTicksLabel;
+ GUI::StaticTextWidget *_overtureTicksValue;
- void updateOvertureTicksLabel();
+ void updateOvertureTicksValue();
};
} // End of namespace Scumm
Commit: 51867690c44955822823ac9a3192007c9731fd35
https://github.com/scummvm/scummvm/commit/51867690c44955822823ac9a3192007c9731fd35
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-09T08:53:14+01:00
Commit Message:
SCUMM: Fix EGA Loom options in RTL mode
There is a special case for adjusting the padding in Widget::draw() that
is applied, among other things, to widgets whose name contains
"GameOptions". We want that special case to apply to the EGA Loom
options as well, so this is simply another renaming.
At some point, it would probably be a good idea for this special case to
go away.
Changed paths:
engines/scumm/dialogs.cpp
engines/scumm/dialogs.h
engines/scumm/metaengine.cpp
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 19c8cb6fcbe..eac753631af 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -699,13 +699,13 @@ void LoomTownsDifficultyDialog::handleCommand(GUI::CommandSender *sender, uint32
}
}
-LoomEgaOptionsWidget::LoomEgaOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
- OptionsContainerWidget(boss, name, "LoomEgaOptionsDialog", false, domain) {
- GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksLabel", _("Overture Timing:"));
+LoomEgaGameOptionsWidget::LoomEgaGameOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) :
+ OptionsContainerWidget(boss, name, "LoomEgaGameOptionsDialog", false, domain) {
+ GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaGameOptionsDialog.OvertureTicksLabel", _("Overture Timing:"));
text->setAlign(Graphics::TextAlign::kTextAlignEnd);
- _overtureTicksSlider = new GUI::SliderWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicks", _("When using replacement music, this adjusts the time when the Overture changes to the scene with the Lucasfilm and Loom logotypes."), kOvertureTicksChanged);
+ _overtureTicksSlider = new GUI::SliderWidget(widgetsBoss(), "LoomEgaGameOptionsDialog.OvertureTicks", _("When using replacement music, this adjusts the time when the Overture changes to the scene with the Lucasfilm and Loom logotypes."), kOvertureTicksChanged);
// In the Ozawa recording, the transition happens at about 1:56. At is
// turns out, this is a fairly fast version of the tune. After checking
@@ -719,12 +719,12 @@ LoomEgaOptionsWidget::LoomEgaOptionsWidget(GuiObject *boss, const Common::String
_overtureTicksSlider->setMinValue(-160);
_overtureTicksSlider->setMaxValue(540);
- _overtureTicksValue = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaOptionsDialog.OvertureTicksValue", Common::U32String());
+ _overtureTicksValue = new GUI::StaticTextWidget(widgetsBoss(), "LoomEgaGameOptionsDialog.OvertureTicksValue", Common::U32String());
_overtureTicksValue->setFlags(GUI::WIDGET_CLEARBG);
}
-void LoomEgaOptionsWidget::load() {
+void LoomEgaGameOptionsWidget::load() {
int loomOvertureTicks = 0;
if (ConfMan.hasKey("loom_overture_ticks", _domain))
@@ -734,12 +734,12 @@ void LoomEgaOptionsWidget::load() {
updateOvertureTicksValue();
}
-bool LoomEgaOptionsWidget::save() {
+bool LoomEgaGameOptionsWidget::save() {
ConfMan.setInt("loom_overture_ticks", _overtureTicksSlider->getValue(), _domain);
return true;
}
-void LoomEgaOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
+void LoomEgaGameOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
layouts.addDialog(layoutName, overlayedLayout)
.addLayout(GUI::ThemeLayout::kLayoutHorizontal, 12)
.addPadding(0, 0, 16, 0)
@@ -750,7 +750,7 @@ void LoomEgaOptionsWidget::defineLayout(GUI::ThemeEval &layouts, const Common::S
.closeDialog();
}
-void LoomEgaOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
+void LoomEgaGameOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kOvertureTicksChanged:
@@ -762,7 +762,7 @@ void LoomEgaOptionsWidget::handleCommand(GUI::CommandSender *sender, uint32 cmd,
}
}
-void LoomEgaOptionsWidget::updateOvertureTicksValue() {
+void LoomEgaGameOptionsWidget::updateOvertureTicksValue() {
int ticks = DEFAULT_LOOM_OVERTURE_TRANSITION + _overtureTicksSlider->getValue();
_overtureTicksValue->setLabel(Common::String::format("%d:%02d.%d", ticks / 600, (ticks % 600) / 10, ticks % 10));
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index c039b3b0df0..50c0c0725ae 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -210,12 +210,12 @@ private:
};
/**
- * Options widget for EGA Loom
+ * Options widget for EGA Loom.
*/
-class LoomEgaOptionsWidget : public GUI::OptionsContainerWidget {
+class LoomEgaGameOptionsWidget : public GUI::OptionsContainerWidget {
public:
- LoomEgaOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
- ~LoomEgaOptionsWidget() override {};
+ LoomEgaGameOptionsWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
+ ~LoomEgaGameOptionsWidget() override {};
void load() override;
bool save() override;
diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 423ed5f4df0..653571f909f 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -542,7 +542,7 @@ GUI::OptionsContainerWidget *ScummMetaEngine::buildEngineOptionsWidgetDynamic(GU
return nullptr;
// So we still can't be quite sure it's the EGA version. Oh well...
- return new Scumm::LoomEgaOptionsWidget(boss, name, target);
+ return new Scumm::LoomEgaGameOptionsWidget(boss, name, target);
}
#if PLUGIN_ENABLED_DYNAMIC(SCUMM)
More information about the Scummvm-git-logs
mailing list