UI|Video Settings: Setting the window to a particular display mode size

skyjake · Sep 11, 2013 · 79ddeb4 · 79ddeb4
1 parent f3d3008
commit 79ddeb4
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/doomsday/client/data/defaultstyle.pack/graphics/window.png b/doomsday/client/data/defaultstyle.pack/graphics/window.png
diff --git a/doomsday/client/data/defaultstyle.pack/images.dei b/doomsday/client/data/defaultstyle.pack/images.dei
@@ -3,6 +3,7 @@
 group window {
     image background { path = "graphics/background.jpg" }
     image borderglow { path = "graphics/borderglow.png" }
+    image icon       { path = "graphics/window.png" }
 }
 
 group logo {

diff --git a/doomsday/client/include/ui/dialogs/videosettingsdialog.h b/doomsday/client/include/ui/dialogs/videosettingsdialog.h
@@ -36,6 +36,8 @@ protected slots:
     void changeMode(uint selected);
     void changeColorDepth(uint selected);
     void showColorAdjustments();
+    void showWindowMenu();
+    void applyModeToWindow();
 
 private:
     DENG2_PRIVATE(d)

diff --git a/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp b/doomsday/client/src/ui/dialogs/videosettingsdialog.cpp
@@ -50,6 +50,7 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
     CVarToggleWidget *fsaa;
     CVarToggleWidget *vsync;
     ChoiceWidget *modes;
+    ButtonWidget *windowButton;
 #ifdef USE_COLOR_DEPTH_CHOICE
     ChoiceWidget *depths;
 #endif
@@ -58,15 +59,16 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
     {
         ScrollAreaWidget &area = self.area();
 
-        area.add(showFps    = new VariableToggleWidget(App::config()["window.main.showFps"]));
-        area.add(fullscreen = new ToggleWidget);
-        area.add(maximized  = new ToggleWidget);
-        area.add(centered   = new ToggleWidget);
-        area.add(fsaa       = new CVarToggleWidget("vid-fsaa"));
-        area.add(vsync      = new CVarToggleWidget("vid-vsync"));
-        area.add(modes      = new ChoiceWidget);
+        area.add(showFps      = new VariableToggleWidget(App::config()["window.main.showFps"]));
+        area.add(fullscreen   = new ToggleWidget);
+        area.add(maximized    = new ToggleWidget);
+        area.add(centered     = new ToggleWidget);
+        area.add(fsaa         = new CVarToggleWidget("vid-fsaa"));
+        area.add(vsync        = new CVarToggleWidget("vid-vsync"));
+        area.add(modes        = new ChoiceWidget);
+        area.add(windowButton = new ButtonWidget);
 #ifdef USE_COLOR_DEPTH_CHOICE
-        area.add(depths     = new ChoiceWidget);
+        area.add(depths       = new ChoiceWidget);
 #endif
         win.audienceForAttributeChange += this;
     }
@@ -85,6 +87,8 @@ DENG2_OBSERVES(PersistentCanvasWindow, AttributeChange)
         maximized->setActive(win.isMaximized());
         centered->setActive(win.isCentered());
 
+        windowButton->enable(!win.isFullScreen() && !win.isMaximized());
+
         fsaa->updateFromCVar();
         vsync->updateFromCVar();
 
@@ -193,6 +197,10 @@ VideoSettingsDialog::VideoSettingsDialog(String const &name)
             << new DialogButtonItem(DialogWidget::Action, tr("Reset to Defaults"),
                                     new SignalAction(this, SLOT(resetToDefaults())));
 
+    d->windowButton->setImage(style().images().image("window.icon"));
+    d->windowButton->setOverrideImageSize(style().fonts().font("default").height().valuei());
+    d->windowButton->setAction(new SignalAction(this, SLOT(showWindowMenu())));
+
     // Layout all widgets.
     Rule const &gap = style().rules().rule("dialog.gap");
 
@@ -210,7 +218,14 @@ VideoSettingsDialog::VideoSettingsDialog(String const &name)
     GridLayout modeLayout(d->vsync->rule().left(), d->vsync->rule().bottom() + gap);
     modeLayout.setGridSize(2, 0);
     modeLayout.setColumnAlignment(0, ui::AlignRight);
-    modeLayout << *modeLabel << *d->modes;
+    modeLayout << *modeLabel;
+
+    modeLayout.append(*d->modes, d->modes->rule().width() + d->windowButton->rule().width());
+
+    d->windowButton->rule()
+            .setInput(Rule::Top,  d->modes->rule().top())
+            .setInput(Rule::Left, d->modes->rule().right());
+
 #ifdef USE_COLOR_DEPTH_CHOICE
     modeLayout << *colorLabel << *d->depths;
 #endif
@@ -269,3 +284,29 @@ void VideoSettingsDialog::showColorAdjustments()
     d->win.showColorAdjustments();
     d->win.taskBar().closeConfigMenu();
 }
+
+void VideoSettingsDialog::showWindowMenu()
+{
+    PopupMenuWidget *menu = new PopupMenuWidget;
+    menu->setDeleteAfterDismissed(true);
+    add(menu);
+
+    menu->setAnchorAndOpeningDirection(d->windowButton->rule(), ui::Up);
+    menu->items()
+            << new ActionItem(tr("Apply to Window"),
+                              new SignalAction(this, SLOT(applyModeToWindow())));
+    menu->open();
+}
+
+void VideoSettingsDialog::applyModeToWindow()
+{
+    QPoint const res = d->modes->selectedItem().data().toPoint();
+
+    int attribs[] = {
+        ClientWindow::Width,  res.x(),
+        ClientWindow::Height, res.y(),
+        ClientWindow::End
+    };
+
+    d->win.changeAttributes(attribs);
+}