UI|Client|PopupWidget: "Info" style for popups

A popup widget may now configure itself for "informational" use.
skyjake · Aug 24, 2013 · 52c309d · 52c309d
1 parent d81079e
commit 52c309d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/doomsday/client/data/defaultstyle.pack/colors.dei b/doomsday/client/data/defaultstyle.pack/colors.dei
@@ -30,6 +30,13 @@ group label {
     color dimaccent { rgb <0.85, 0.68, 0.34> }
 }
 
+group popup {
+    group info {
+        color background { rgb <1.0, 1.0, 1.0> }
+        color glow       { rgb $= inverted.glow.rgb }
+    }
+}
+
 group choice {
     color popup { rgb $= gui.colorAlpha(background.rgb, 1.0) }
 }
@@ -54,10 +61,10 @@ group editor {
     color cursor { rgb $= gui.colorAlpha(accent.rgb, 0.7) }
     color hint   { rgb $= textaccent.rgb }
 
-    group completion {
-        color background { rgb <1.0, 1.0, 1.0> }
-        color glow       { rgb $= inverted.glow.rgb }
-    }
+    #group completion {
+    #    color background { rgb <1.0, 1.0, 1.0> }
+    #    color glow       { rgb $= inverted.glow.rgb }
+    #}
 }
 
 group log {

diff --git a/doomsday/client/include/ui/widgets/popupwidget.h b/doomsday/client/include/ui/widgets/popupwidget.h
@@ -85,6 +85,12 @@ class PopupWidget : public GuiWidget
      */
     void setClickToClose(bool clickCloses);
 
+    /**
+     * Sets the style of the popup to the one used for informational popups
+     * rather than interactive (the default) ones.
+     */
+    void useInfoStyle();
+
     // Events.
     void viewResized();
     void update();

diff --git a/doomsday/client/src/ui/widgets/consolecommandwidget.cpp b/doomsday/client/src/ui/widgets/consolecommandwidget.cpp
@@ -50,10 +50,13 @@ public IGameChangeObserver
         completions->setMaximumLineWidth(640);
 
         popup = new PopupWidget;
+        popup->useInfoStyle();
+        /*
         popup->set(Background(st.colors().colorf("editor.completion.background"),
                               Background::BorderGlow,
                               st.colors().colorf("editor.completion.glow"),
                               st.rules().rule("glow").valuei()));
+                              */
         popup->setContent(completions);
 
         // Height for the content: depends on the document height (plus margins), but at

diff --git a/doomsday/client/src/ui/widgets/popupwidget.cpp b/doomsday/client/src/ui/widgets/popupwidget.cpp
@@ -323,6 +323,14 @@ void PopupWidget::setClickToClose(bool clickCloses)
     d->clickToClose = clickCloses;
 }
 
+void PopupWidget::useInfoStyle()
+{
+    set(Background(style().colors().colorf("popup.info.background"),
+                   Background::BorderGlow,
+                   style().colors().colorf("popup.info.glow"),
+                   style().rules().rule("glow").valuei()));
+}
+
 void PopupWidget::viewResized()
 {
     GuiWidget::viewResized();