UI|Client: Configuring aspect ratio options in Video Settings

IssueID #1997

doomsday/client/src/ui/clientwindowsystem.cpp

@@ -44,10 +44,15 @@ DENG2_PIMPL(ClientWindowSystem)
         self.setStyle(new ClientStyle);
         self.style().load(App::packageLoader().load("net.dengine.client.defaultstyle"));
 
-        settings.define(SettingsRegister::ConfigVariable, "window.main.showFps")
-                .define(SettingsRegister::ConfigVariable, "window.main.fsaa")
-                .define(SettingsRegister::ConfigVariable, "window.main.vsync")
-                .define(SettingsRegister::ConfigVariable, "render.pixelDensity");
+        using SReg = SettingsRegister;
+        settings.define(SReg::ConfigVariable, "window.main.showFps")
+                .define(SReg::ConfigVariable, "window.main.fsaa")
+                .define(SReg::ConfigVariable, "window.main.vsync")
+                .define(SReg::ConfigVariable, "render.pixelDensity")
+                .define(SReg::IntCVar,        "rend-finale-stretch", SCALEMODE_SMART_STRETCH)
+                .define(SReg::IntCVar,        "rend-hud-stretch", SCALEMODE_SMART_STRETCH)
+                .define(SReg::IntCVar,        "inlude-stretch", SCALEMODE_SMART_STRETCH)
+                .define(SReg::IntCVar,        "menu-stretch", SCALEMODE_SMART_STRETCH);
     }
 };
 

doomsday/client/src/ui/dialogs/videosettingsdialog.cpp

@@ -18,9 +18,11 @@
 
 #include "ui/dialogs/videosettingsdialog.h"
 #include "ui/widgets/taskbarwidget.h"
+#include "ui/widgets/cvarchoicewidget.h"
 #include "ui/clientwindow.h"
 #include "CommandAction"
 #include "clientapp.h"
+#include "dd_main.h"
 
 #include <doomsday/console/exec.h>
 #include <de/VariableToggleWidget>
@@ -54,6 +56,11 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
 #ifdef USE_COLOR_DEPTH_CHOICE
     ChoiceWidget *depths;
 #endif
+    ListData stretchChoices;
+    CVarChoiceWidget *finaleAspect;
+    CVarChoiceWidget *hudAspect;
+    CVarChoiceWidget *inludeAspect = nullptr;
+    CVarChoiceWidget *menuAspect = nullptr;
 
     Instance(Public *i)
         : Base(i)
@@ -73,10 +80,37 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
         area.add(depths       = new ChoiceWidget);
 #endif
         win.audienceForAttributeChange() += this;
+
+        if(App_GameLoaded())
+        {
+            stretchChoices
+                << new ChoiceItem(tr("Smart"),        SCALEMODE_SMART_STRETCH)
+                << new ChoiceItem(tr("Original 1:1"), SCALEMODE_NO_STRETCH)
+                << new ChoiceItem(tr("Stretched"),    SCALEMODE_STRETCH);
+
+            area.add(finaleAspect = new CVarChoiceWidget("rend-finale-stretch"));
+            area.add(hudAspect    = new CVarChoiceWidget("rend-hud-stretch"));
+            area.add(inludeAspect = new CVarChoiceWidget("inlude-stretch"));
+            area.add(menuAspect   = new CVarChoiceWidget("menu-stretch"));
+
+            finaleAspect->setItems(stretchChoices);
+            hudAspect->setItems(stretchChoices);
+            inludeAspect->setItems(stretchChoices);
+            menuAspect->setItems(stretchChoices);
+        }
     }
 
     ~Instance()
     {
+        // The common stretchChoices is being deleted now, before the widget tree.
+        if(finaleAspect)
+        {
+            finaleAspect->useDefaultItems();
+            hudAspect->useDefaultItems();
+            inludeAspect->useDefaultItems();
+            menuAspect->useDefaultItems();
+        }
+
         win.audienceForAttributeChange() -= this;
     }
 
@@ -115,6 +149,12 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
         // Select the current color depth in the depth list.
         depths->setSelected(depths->items().findData(win.colorDepthBits()));
 #endif
+
+        foreach(Widget *child, self.area().childWidgets())
+        {
+            if(ICVarWidget *cw = child->maybeAs<ICVarWidget>())
+                cw->updateFromCVar();
+        }
     }
 
     void windowAttributesChanged(PersistentCanvasWindow &)
@@ -259,6 +299,20 @@ VideoSettingsDialog::VideoSettingsDialog(String const &name)
         modeLayout << Const(0) << *adjustButton;
     }
 
+    if(d->inludeAspect)
+    {
+        // Aspect ratio options.
+        auto *aspectLabel = LabelWidget::newWithText(_E(D) + tr("Aspect Ratios"), &area());
+        aspectLabel->setFont("separator.label");
+        aspectLabel->margins().setTop("gap");
+        modeLayout.setCellAlignment(Vector2i(0, modeLayout.gridSize().y), ui::AlignLeft);
+        modeLayout.append(*aspectLabel, 2)
+                << *LabelWidget::newWithText(tr("Player Weapons:"), &area()) << *d->hudAspect
+                << *LabelWidget::newWithText(tr("Menus:"), &area()) << *d->menuAspect
+                << *LabelWidget::newWithText(tr("Intermissions:"), &area()) << *d->inludeAspect
+                << *LabelWidget::newWithText(tr("Finales:"), &area()) << *d->finaleAspect;
+    }
+
     area().setContentSize(OperatorRule::maximum(layout.width(), modeLayout.width()),
                           layout.height() + gap + modeLayout.height());
 

doomsday/libappfw/include/de/widgets/menuwidget.h

@@ -93,6 +93,8 @@ class LIBAPPFW_PUBLIC MenuWidget : public ScrollAreaWidget
 
     void useDefaultItems();
 
+    bool isUsingDefaultItems() const;
+
     ChildWidgetOrganizer &organizer();
     ChildWidgetOrganizer const &organizer() const;
 

doomsday/libappfw/src/widgets/menuwidget.cpp

@@ -416,6 +416,11 @@ void MenuWidget::useDefaultItems()
     d->setContext(&d->defaultItems);
 }
 
+bool MenuWidget::isUsingDefaultItems() const
+{
+    return d->items == &d->defaultItems;
+}
+
 int MenuWidget::count() const
 {
     return d->countVisible();