UI|Client: Animate alerts and server list items as they appear

skyjake · Jan 26, 2014 · 5d3d425 · 5d3d425
1 parent 9bd6382
commit 5d3d425
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/doomsday/client/data/defaultstyle.pack/rules.dei b/doomsday/client/data/defaultstyle.pack/rules.dei
@@ -36,9 +36,10 @@ group slider {
 group dialog {
     rule gap { constant $= UNIT * 2 }
 
-    rule about.width    { constant $= UNIT * 80 }
-    rule message.width  { constant $= UNIT * 115 }
-    rule download.width { constant $= UNIT * 115 }
+    rule about.width       { constant $= UNIT * 80 }
+    rule message.width     { constant $= UNIT * 115 }
+    rule download.width    { constant $= UNIT * 115 }
+    rule multiplayer.width { constant $= UNIT * 80 }
 }
 
 group alerts {

diff --git a/doomsday/client/src/ui/dialogs/alertdialog.cpp b/doomsday/client/src/ui/dialogs/alertdialog.cpp
@@ -164,6 +164,8 @@ DENG_GUI_PIMPL(AlertDialog)
         label.setTextStyle(&styling);
         label.setMaximumTextWidth(style().rules().rule("alerts.width").valuei());
         label.setSizePolicy(ui::Expand, ui::Expand);
+        label.setAppearanceAnimation(LabelWidget::AppearGrowVertically, 0.5);
+        label.setAlignment(ui::AlignBottom);
         label.setImage(style().images().image("alert"));
         label.setOverrideImageSize(style().fonts().font("default").height().value());
         label.setImageAlignment(ui::AlignTop);

diff --git a/doomsday/client/src/ui/dialogs/multiplayerdialog.cpp b/doomsday/client/src/ui/dialogs/multiplayerdialog.cpp
@@ -70,9 +70,12 @@ DENG_GUI_PIMPL(MultiplayerDialog)
         //LabelWidget *info;
         ButtonWidget *extra;
         ButtonWidget *join;
+        QScopedPointer<SequentialLayout> layout;
 
         ServerWidget()
         {
+            setBehavior(ContentClipping);
+
             add(title = new LabelWidget);
             //add(info  = new LabelWidget);
             add(extra = new ButtonWidget);
@@ -82,19 +85,22 @@ DENG_GUI_PIMPL(MultiplayerDialog)
             join->setText(tr("Join"));
 
             title->setSizePolicy(ui::Expand, ui::Expand);
+            title->setAppearanceAnimation(LabelWidget::AppearGrowVertically, 0.5);
+            title->setAlignment(ui::AlignTop);
             title->setTextAlignment(ui::AlignRight);
             title->setTextLineAlignment(ui::AlignLeft);
             title->setImageAlignment(ui::AlignTop);
+            title->setMaximumTextWidth(style().rules().rule("dialog.multiplayer.width").valuei());
 
             //info->setSizePolicy(ui::Expand, ui::Expand);
             extra->setSizePolicy(ui::Expand, ui::Expand);
             join->setSizePolicy(ui::Expand, ui::Expand);
 
             join->disable();
 
-            SequentialLayout layout(rule().left(), rule().top(), ui::Right);
-            layout << *title << *extra << *join;
-            rule().setSize(layout.width(), layout.height());
+            layout.reset(new SequentialLayout(rule().left(), rule().top(), ui::Right));
+            *layout << *title << *extra << *join;
+            rule().setSize(layout->width(), title->rule().height());
         }
 
         void updateFromItem(ServerListItem const &item)