Resize mode patch (#1019)

* Fix transformation mode for layers

Resolve #997

* always use smooth transform resampling for stretched images

* Used fixed frame size

* Implemented resize mode changes

Resolve #999

* Added alias to pixel resize mode

* Added user option

---------

Co-authored-by: in1tiate <32779090+in1tiate@users.noreply.github.com>

2 files changed, 15 insertions, 10 deletions

diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
index db3c8788..2c7b4e28 100644
--- a/src/widgets/aooptionsdialog.cpp
+++ b/src/widgets/aooptionsdialog.cpp
@@ -112,12 +112,24 @@ void AOOptionsDialog::setWidgetData(QComboBox *widget, const QString &value)
 }
 
 template <>
+void AOOptionsDialog::setWidgetData(QComboBox *widget, const RESIZE_MODE &value)
+{
+  widget->setCurrentIndex(value);
+}
+
+template <>
 QString AOOptionsDialog::widgetData(QComboBox *widget) const
 {
   return widget->currentData().toString();
 }
 
 template <>
+RESIZE_MODE AOOptionsDialog::widgetData(QComboBox *widget) const
+{
+  return RESIZE_MODE(widget->currentIndex());
+}
+
+template <>
 void AOOptionsDialog::setWidgetData(QGroupBox *widget, const bool &value)
 {
   widget->setChecked(value);
@@ -344,7 +356,7 @@ void AOOptionsDialog::setupUI()
   FROM_UI(QLineEdit, ms_textbox);
   FROM_UI(QCheckBox, discord_cb);
   FROM_UI(QComboBox, language_combobox);
-  FROM_UI(QComboBox, scaling_combobox);
+  FROM_UI(QComboBox, resize_combobox);
   FROM_UI(QCheckBox, shake_cb);
   FROM_UI(QCheckBox, effects_cb);
   FROM_UI(QCheckBox, framenetwork_cb);
@@ -382,13 +394,7 @@ void AOOptionsDialog::setupUI()
   ui_language_combobox->addItem("日本語", "jp");
   ui_language_combobox->addItem("Русский", "ru");
 
-  registerOption<QComboBox, QString>("scaling_combobox", &Options::defaultScalingMode, &Options::setDefaultScalingMode);
-
-  // Populate scaling dropdown. This is necessary as we need the user data
-  // embeeded into the entry.
-  ui_scaling_combobox->addItem(tr("Pixel"), "fast");
-  ui_scaling_combobox->addItem(tr("Smooth"), "smooth");
-
+  registerOption<QComboBox, RESIZE_MODE>("resize_combobox", &Options::resizeMode, &Options::setResizeMode);
   registerOption<QCheckBox, bool>("shake_cb", &Options::shakeEnabled, &Options::setShakeEnabled);
   registerOption<QCheckBox, bool>("effects_cb", &Options::effectsEnabled, &Options::setEffectsEnabled);
   registerOption<QCheckBox, bool>("framenetwork_cb", &Options::networkedFrameSfxEnabled, &Options::setNetworkedFrameSfxEnabled);
diff --git a/src/widgets/aooptionsdialog.h b/src/widgets/aooptionsdialog.h
index eb64a539..20c95a3f 100644
--- a/src/widgets/aooptionsdialog.h
+++ b/src/widgets/aooptionsdialog.h
@@ -63,8 +63,7 @@ private:
   QCheckBox *ui_discord_cb;
   QLabel *ui_language_label;
   QComboBox *ui_language_combobox;
-  QLabel *ui_scaling_label;
-  QComboBox *ui_scaling_combobox;
+  QComboBox *ui_resize_combobox;
   QCheckBox *ui_shake_cb;
   QCheckBox *ui_effects_cb;
   QCheckBox *ui_framenetwork_cb;