Refactor|libappfw|Client: ScalarRule was renamed to AnimationRule

skyjake · Apr 22, 2016 · 7f7a12c · 7f7a12c
1 parent af25ab9
commit 7f7a12c
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 deletions.
diff --git a/doomsday/apps/client/src/ui/home/homewidget.cpp b/doomsday/apps/client/src/ui/home/homewidget.cpp
@@ -68,7 +68,7 @@ DENG_GUI_PIMPL(HomeWidget)
     TabWidget *tabs;
     SafeWidgetPtr<FadeToBlackWidget> blanker;
     int currentOffsetTab = 0;
-    ScalarRule *scrollOffset;
+    AnimationRule *scrollOffset;
     ButtonWidget *moveLeft;
     ButtonWidget *moveRight;
     ButtonWidget *taskBarHintButton;
@@ -83,7 +83,7 @@ DENG_GUI_PIMPL(HomeWidget)
         DoomsdayApp::app().audienceForGameUnload() += this;
 
         columnWidth  = new IndirectRule;
-        scrollOffset = new ScalarRule(0);
+        scrollOffset = new AnimationRule(0);
         scrollOffset->setStyle(Animation::EaseOut);
 
         tabs = new TabWidget;

diff --git a/doomsday/apps/client/src/ui/widgets/consolewidget.cpp b/doomsday/apps/client/src/ui/widgets/consolewidget.cpp
@@ -34,7 +34,7 @@
 #include <de/PersistentState>
 #include <de/PopupButtonWidget>
 #include <de/PopupMenuWidget>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 #include <de/ScriptCommandWidget>
 #include <de/SignalAction>
 #include <de/ToggleWidget>
@@ -60,9 +60,9 @@ DENG_GUI_PIMPL(ConsoleWidget)
     ConsoleCommandWidget *cmdLine = nullptr;
     ScriptCommandWidget *scriptCmd = nullptr;
     LogWidget *log = nullptr;
-    ScalarRule *horizShift;
-    ScalarRule *height;
-    ScalarRule *width;
+    AnimationRule *horizShift;
+    AnimationRule *height;
+    AnimationRule *width;
     StyledLogSinkFormatter formatter;
     bool opened = true;
     bool scriptMode = false;
@@ -79,9 +79,9 @@ DENG_GUI_PIMPL(ConsoleWidget)
 
     Instance(Public *i) : Base(i)
     {
-        horizShift = new ScalarRule(0);
-        width      = new ScalarRule(rule("console.width").valuei());
-        height     = new ScalarRule(0);
+        horizShift = new AnimationRule(0);
+        width      = new AnimationRule(rule("console.width").valuei());
+        height     = new AnimationRule(0);
 
         grabWidth  = rule("gap").valuei();
 

diff --git a/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp b/doomsday/apps/client/src/ui/widgets/homeitemwidget.cpp
@@ -93,7 +93,7 @@ DENG_GUI_PIMPL(HomeItemWidget)
     LabelWidget *icon;
     LabelWidget *label;
     QList<ButtonWidget *> buttons;
-    ScalarRule *labelRightMargin;
+    AnimationRule *labelRightMargin;
     Rule const *buttonsWidth = nullptr;
     bool selected = false;
     DotPath bgColor           { "transparent" };
@@ -104,7 +104,7 @@ DENG_GUI_PIMPL(HomeItemWidget)
 
     Instance(Public *i) : Base(i)
     {
-        labelRightMargin    = new ScalarRule(0);
+        labelRightMargin    = new AnimationRule(0);
 
         self.add(background = new LabelWidget);
         self.add(icon       = new LabelWidget);

diff --git a/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/apps/client/src/ui/widgets/taskbarwidget.cpp
@@ -54,7 +54,7 @@
 #include <de/GLBuffer>
 #include <de/KeyEvent>
 #include <de/PopupMenuWidget>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 #include <de/SequentialLayout>
 #include <de/SignalAction>
 #include <de/ui/SubwidgetItem>
@@ -112,7 +112,7 @@ DENG_GUI_PIMPL(TaskBarWidget)
     PopupMenuWidget *configMenu;
     MultiplayerMenuWidget *multiMenu;
 
-    ScalarRule *vertShift;
+    AnimationRule *vertShift;
     bool mouseWasTrappedWhenOpening;
     int minSpace;
     int maxSpace;
@@ -140,7 +140,7 @@ DENG_GUI_PIMPL(TaskBarWidget)
         uColor = Vector4f(1, 1, 1, 1);
         self.set(Background(style().colors().colorf("background")));
 
-        vertShift = new ScalarRule(0);
+        vertShift = new AnimationRule(0);
 
         DoomsdayApp::app().audienceForGameChange() += this;
         ClientApp::serverLink().audienceForJoin += this;

diff --git a/doomsday/sdk/libappfw/include/de/widgets/scrollareawidget.h b/doomsday/sdk/libappfw/include/de/widgets/scrollareawidget.h
@@ -78,8 +78,8 @@ class LIBAPPFW_PUBLIC ScrollAreaWidget : public GuiWidget
 
     RuleRectangle const &contentRule() const;
 
-    ScalarRule &scrollPositionX() const;
-    ScalarRule &scrollPositionY() const;
+    AnimationRule &scrollPositionX() const;
+    AnimationRule &scrollPositionY() const;
     Rule const &maximumScrollX() const;
     Rule const &maximumScrollY() const;
 

diff --git a/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
@@ -55,7 +55,7 @@ public Font::RichFormat::IStyle
 
     ConstantRule *width;
     ConstantRule *height;
-    ScalarRule *appearSize;
+    AnimationRule *appearSize;
     LabelWidget::AppearanceAnimation appearType;
     TimeDelta appearSpan;
 
@@ -93,7 +93,7 @@ public Font::RichFormat::IStyle
         , imageColor  (1, 1, 1, 1)
         , textGLColor (1, 1, 1, 1)
         , maxTextWidth(0)
-        , appearSize  (new ScalarRule(0))
+        , appearSize  (new AnimationRule(0))
         , appearType  (AppearInstantly)
         , appearSpan  (0.0)
         , gapId       ("label.gap")

diff --git a/doomsday/sdk/libappfw/src/widgets/lineeditwidget.cpp b/doomsday/sdk/libappfw/src/widgets/lineeditwidget.cpp
@@ -25,7 +25,7 @@
 
 #include <de/KeyEvent>
 #include <de/MouseEvent>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 #include <de/Drawable>
 
 namespace de {
@@ -40,7 +40,7 @@ DENG_GUI_PIMPL(LineEditWidget)
 {
     typedef GLBufferT<Vertex2TexRgba> VertexBuf;
 
-    ScalarRule *height;
+    AnimationRule *height;
     FontLineWrapping &wraps;
     LabelWidget *hint;
     bool signalOnEnter;
@@ -70,7 +70,7 @@ DENG_GUI_PIMPL(LineEditWidget)
         , uColor      ("uColor",     GLUniform::Vec4)
         , uCursorColor("uColor",     GLUniform::Vec4)
     {
-        height = new ScalarRule(0);
+        height = new AnimationRule(0);
 
         self.setFont("editor.plaintext");
         updateStyle();

diff --git a/doomsday/sdk/libappfw/src/widgets/notificationareawidget.cpp b/doomsday/sdk/libappfw/src/widgets/notificationareawidget.cpp
@@ -22,7 +22,7 @@
 
 #include <de/Drawable>
 #include <de/Matrix>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 
 #include <QMap>
 #include <QTimer>
@@ -34,7 +34,7 @@ static TimeDelta const ANIM_SPAN = .5;
 DENG_GUI_PIMPL(NotificationAreaWidget)
 , DENG2_OBSERVES(Widget, Deletion)
 {
-    ScalarRule *shift;
+    AnimationRule *shift;
     QMap<GuiWidget *, RelayWidget *> shown;
 
     QTimer dismissTimer;
@@ -46,7 +46,7 @@ DENG_GUI_PIMPL(NotificationAreaWidget)
         dismissTimer.setInterval(ANIM_SPAN.asMilliSeconds());
         QObject::connect(&dismissTimer, SIGNAL(timeout()), thisPublic, SLOT(dismiss()));
 
-        shift = new ScalarRule(0);
+        shift = new AnimationRule(0);
     }
 
     ~Instance()

diff --git a/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/panelwidget.cpp
@@ -21,7 +21,7 @@
 
 #include <de/Drawable>
 #include <de/MouseEvent>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 #include <de/math.h>
 
 #include <QTimer>
@@ -40,7 +40,7 @@ DENG_GUI_PIMPL(PanelWidget)
     ui::Direction dir = ui::Down;
     ui::SizePolicy secondaryPolicy = ui::Expand;
     GuiWidget *content = nullptr;
-    ScalarRule *openingRule;
+    AnimationRule *openingRule;
     QTimer dismissTimer;
 
     QScopedPointer<AssetGroup> pendingShow;
@@ -51,7 +51,7 @@ DENG_GUI_PIMPL(PanelWidget)
 
     Instance(Public *i) : Base(i)
     {
-        openingRule = new ScalarRule(0);
+        openingRule = new AnimationRule(0);
 
         dismissTimer.setSingleShot(true);
         QObject::connect(&dismissTimer, SIGNAL(timeout()), thisPublic, SLOT(dismiss()));

diff --git a/doomsday/sdk/libappfw/src/widgets/popupwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <de/Drawable>
 #include <de/MouseEvent>
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 #include <de/Garbage>
 #include <de/math.h>
 #include <QTimer>

diff --git a/doomsday/sdk/libappfw/src/widgets/scrollareawidget.cpp b/doomsday/sdk/libappfw/src/widgets/scrollareawidget.cpp
@@ -37,8 +37,8 @@ DENG_GUI_PIMPL(ScrollAreaWidget), public Lockable
      */
     RuleRectangle contentRule;
 
-    ScalarRule *x;
-    ScalarRule *y;
+    AnimationRule *x;
+    AnimationRule *y;
     Rule *maxX;
     Rule *maxY;
 
@@ -75,8 +75,8 @@ DENG_GUI_PIMPL(ScrollAreaWidget), public Lockable
 
         updateStyle();
 
-        x = new ScalarRule(0);
-        y = new ScalarRule(0);
+        x = new AnimationRule(0);
+        y = new AnimationRule(0);
 
         maxX = new OperatorRule(OperatorRule::Maximum, Const(0),
                                 contentRule.width() - self.rule().width() + self.margins().width());
@@ -264,12 +264,12 @@ RuleRectangle const &ScrollAreaWidget::contentRule() const
     return d->contentRule;
 }
 
-ScalarRule &ScrollAreaWidget::scrollPositionX() const
+AnimationRule &ScrollAreaWidget::scrollPositionX() const
 {
     return *d->x;
 }
 
-ScalarRule &ScrollAreaWidget::scrollPositionY() const
+AnimationRule &ScrollAreaWidget::scrollPositionY() const
 {
     return *d->y;
 }

diff --git a/doomsday/sdk/libappfw/src/widgets/tabwidget.cpp b/doomsday/sdk/libappfw/src/widgets/tabwidget.cpp
@@ -20,7 +20,7 @@
 #include "de/ui/ListData"
 #include "de/MenuWidget"
 
-#include <de/ScalarRule>
+#include <de/AnimationRule>
 
 Q_DECLARE_METATYPE(de::ui::Item const *)
 
@@ -37,8 +37,8 @@ DENG_GUI_PIMPL(TabWidget)
     bool needUpdate = false;
     bool invertedStyle = false;
     LabelWidget *selected = nullptr;
-    ScalarRule *selLeft = nullptr;
-    ScalarRule *selWidth = nullptr;
+    AnimationRule *selLeft = nullptr;
+    AnimationRule *selWidth = nullptr;
 
     Instance(Public *i) : Base(i)
     {
@@ -132,8 +132,8 @@ DENG_GUI_PIMPL(TabWidget)
                 {
                     // Initialize the animated rules for positioning the
                     // selection highlight.
-                    selLeft  = new ScalarRule(0);
-                    selWidth = new ScalarRule(0);
+                    selLeft  = new AnimationRule(0);
+                    selWidth = new AnimationRule(0);
                     selected->rule()
                         .setInput(Rule::Width,  *selWidth)
                         .setInput(Rule::Left,   *selLeft);