Refactor|libcommon|Menu: Continued reworking menu widgets

Widget geometry, page layouts (etc.) now use libcore components such as de::Rectangle<> Widget drawing functions now const. Cleaned up the Widget::Action mechanism. Various minor cleanup refactorings.
skyjake · Sep 22, 2014 · ed50904 · ed50904
1 parent 0306c24
commit ed50904
Show file tree

Hide file tree

Showing 40 changed files with 723 additions and 944 deletions.
diff --git a/doomsday/plugins/common/include/hu_menu.h b/doomsday/plugins/common/include/hu_menu.h
@@ -188,12 +188,12 @@ void Hu_MenuConsoleRegister();
 
 // ----------------------------------------------------------------------------------------
 
-void Hu_MenuDefaultFocusAction(menu::Widget *wi, menu::Widget::mn_actionid_t action);
+void Hu_MenuDefaultFocusAction(menu::Widget &wi, menu::Widget::Action action);
 
-void Hu_MenuDrawFocusCursor(int x, int y, int focusObjectHeight, float alpha);
+void Hu_MenuDrawFocusCursor(de::Vector2i const &origin, int focusObjectHeight, float alpha);
 
-void Hu_MenuDrawPageTitle(de::String title, int x, int y);
-void Hu_MenuDrawPageHelp(char const *help, int x, int y);
+void Hu_MenuDrawPageTitle(de::String titleText, de::Vector2i const &origin);
+void Hu_MenuDrawPageHelp(de::String helpText, de::Vector2i const &origin);
 
 /**
  * @defgroup menuEffectFlags  Menu Effect Flags
@@ -206,7 +206,7 @@ void Hu_MenuDrawPageHelp(char const *help, int x, int y);
 #define MEF_EVERYTHING              MEF_TEXT_TYPEIN | MEF_TEXT_SHADOW | MEF_TEXT_GLITTER
 ///@}
 
-short Hu_MenuMergeEffectWithDrawTextFlags(short f);
+short Hu_MenuMergeEffectWithDrawTextFlags(short flags);
 
 } // namespace common
 

diff --git a/doomsday/plugins/common/include/m_ctrl.h b/doomsday/plugins/common/include/m_ctrl.h
@@ -27,8 +27,6 @@
 namespace common {
 namespace menu {
 
-class Page;
-
 // Control config flags.
 #define CCF_NON_INVERSE         0x1
 #define CCF_INVERSE             0x2
@@ -46,8 +44,7 @@ struct controlconfig_t
     int flags;
 };
 
-void Hu_MenuInitControlsPage(void);
-void Hu_MenuDrawControlsPage(Page *page, Point2Raw const *origin);
+void Hu_MenuInitControlsPage();
 void Hu_MenuControlGrabDrawer(char const *niceName, float alpha);
 
 } // namespace menu

diff --git a/doomsday/plugins/common/include/menu/page.h b/doomsday/plugins/common/include/menu/page.h
@@ -58,10 +58,10 @@ class Page
 public:
     typedef QList<Widget *> Widgets;
 
-    typedef void (*OnActiveCallback) (Page *);
-    typedef void (*OnDrawCallback) (Page *, Point2Raw const *);
+    typedef void (*OnActiveCallback) (Page &);
+    typedef void (*OnDrawCallback) (Page const &, de::Vector2i const &);
 
-    typedef int (*CommandResponder) (Page *, menucommand_e);
+    typedef int (*CommandResponder) (Page &, menucommand_e);
 
 public:
     /**

diff --git a/doomsday/plugins/common/include/menu/widgets/buttonwidget.h b/doomsday/plugins/common/include/menu/widgets/buttonwidget.h
@@ -35,8 +35,8 @@ class ButtonWidget : public Widget
     explicit ButtonWidget(de::String const &text = "", patchid_t patch = 0);
     virtual ~ButtonWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleCommand(menucommand_e command);
 
     ButtonWidget &setText(de::String const &newText);

diff --git a/doomsday/plugins/common/include/menu/widgets/coloreditwidget.h b/doomsday/plugins/common/include/menu/widgets/coloreditwidget.h
@@ -49,8 +49,8 @@ class ColorEditWidget : public Widget
                              bool rgbaMode = false);
     virtual ~ColorEditWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleCommand(menucommand_e command);
 
     /**

diff --git a/doomsday/plugins/common/include/menu/widgets/cvarcoloreditwidget.h b/doomsday/plugins/common/include/menu/widgets/cvarcoloreditwidget.h
@@ -51,7 +51,7 @@ class CVarColorEditWidget : public ColorEditWidget
     char const *_cvarPaths[4];
 };
 
-void CVarColorEditWidget_UpdateCVar(Widget *wi, Widget::mn_actionid_t action);
+void CVarColorEditWidget_UpdateCVar(Widget &wi, Widget::Action action);
 
 } // namespace menu
 } // namespace common

diff --git a/doomsday/plugins/common/include/menu/widgets/cvarinlinelistwidget.h b/doomsday/plugins/common/include/menu/widgets/cvarinlinelistwidget.h
@@ -43,7 +43,7 @@ class CVarInlineListWidget : public InlineListWidget
     int _cvarValueMask;
 };
 
-void CVarInlineListWidget_UpdateCVar(Widget *wi, Widget::mn_actionid_t action);
+void CVarInlineListWidget_UpdateCVar(Widget &wi, Widget::Action action);
 
 } // namespace menu
 } // namespace common

diff --git a/doomsday/plugins/common/include/menu/widgets/cvarlineeditwidget.h b/doomsday/plugins/common/include/menu/widgets/cvarlineeditwidget.h
@@ -41,7 +41,7 @@ class CVarLineEditWidget : public LineEditWidget
     char const *_cvarPath;
 };
 
-void CVarLineEditWidget_UpdateCVar(Widget *wi, Widget::mn_actionid_t action);
+void CVarLineEditWidget_UpdateCVar(Widget &wi, Widget::Action action);
 
 } // namespace menu
 } // namespace common

diff --git a/doomsday/plugins/common/include/menu/widgets/cvarsliderwidget.h b/doomsday/plugins/common/include/menu/widgets/cvarsliderwidget.h
@@ -44,7 +44,7 @@ class CVarSliderWidget : public SliderWidget
     char const *_cvarPath;
 };
 
-void CVarSliderWidget_UpdateCVar(Widget *wi, Widget::mn_actionid_t action);
+void CVarSliderWidget_UpdateCVar(Widget &wi, Widget::Action action);
 
 } // namespace menu
 } // namespace common

diff --git a/doomsday/plugins/common/include/menu/widgets/cvartextualsliderwidget.h b/doomsday/plugins/common/include/menu/widgets/cvartextualsliderwidget.h
@@ -39,8 +39,8 @@ class CVarTextualSliderWidget : public CVarSliderWidget
                             float step = 0.1f, bool floatMode = true);
     virtual ~CVarTextualSliderWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
 
     CVarTextualSliderWidget &setEmptyText(de::String const &newEmptyText);
     de::String emptyText() const;

diff --git a/doomsday/plugins/common/include/menu/widgets/cvartogglewidget.h b/doomsday/plugins/common/include/menu/widgets/cvartogglewidget.h
@@ -64,7 +64,7 @@ class CVarToggleWidget : public ButtonWidget
     DENG2_PRIVATE(d)
 };
 
-void CVarToggleWidget_UpdateCVar(Widget *wi, Widget::mn_actionid_t action);
+void CVarToggleWidget_UpdateCVar(Widget &wi, Widget::Action action);
 
 } // namespace menu
 } // namespace common

diff --git a/doomsday/plugins/common/include/menu/widgets/inlinelistwidget.h b/doomsday/plugins/common/include/menu/widgets/inlinelistwidget.h
@@ -33,10 +33,10 @@ class InlineListWidget : public ListWidget
 {
 public:
     InlineListWidget();
-    virtual ~InlineListWidget() {}
+    virtual ~InlineListWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleCommand(menucommand_e command);
 };
 

diff --git a/doomsday/plugins/common/include/menu/widgets/inputbindingwidget.h b/doomsday/plugins/common/include/menu/widgets/inputbindingwidget.h
@@ -40,10 +40,10 @@ class InputBindingWidget : public Widget
 
 public:
     InputBindingWidget();
-    virtual ~InputBindingWidget() {}
+    virtual ~InputBindingWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleEvent_Privileged(event_t *ev);
     int handleCommand(menucommand_e command);
 

diff --git a/doomsday/plugins/common/include/menu/widgets/labelwidget.h b/doomsday/plugins/common/include/menu/widgets/labelwidget.h
@@ -45,8 +45,8 @@ class LabelWidget : public Widget
     LabelWidget(de::String const &text = "", patchid_t *patch = 0);
     virtual ~LabelWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
 
     LabelWidget &setPatch(patchid_t *newPatch);
     LabelWidget &setText(de::String const &newText);

diff --git a/doomsday/plugins/common/include/menu/widgets/lineeditwidget.h b/doomsday/plugins/common/include/menu/widgets/lineeditwidget.h
@@ -66,8 +66,8 @@ class LineEditWidget : public Widget
     LineEditWidget();
     virtual ~LineEditWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleEvent(event_t *ev);
     int handleCommand(menucommand_e command);
 

diff --git a/doomsday/plugins/common/include/menu/widgets/listwidget.h b/doomsday/plugins/common/include/menu/widgets/listwidget.h
@@ -68,8 +68,8 @@ class ListWidget : public Widget
     ListWidget();
     virtual ~ListWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleCommand(menucommand_e command);
 
     /**

diff --git a/doomsday/plugins/common/include/menu/widgets/mobjpreviewwidget.h b/doomsday/plugins/common/include/menu/widgets/mobjpreviewwidget.h
@@ -40,8 +40,8 @@ class MobjPreviewWidget : public Widget
     MobjPreviewWidget();
     virtual ~MobjPreviewWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
 
     void setMobjType(int mobjType);
     void setPlayerClass(int plrClass);

diff --git a/doomsday/plugins/common/include/menu/widgets/rectwidget.h b/doomsday/plugins/common/include/menu/widgets/rectwidget.h
@@ -37,8 +37,8 @@ class RectWidget : public Widget
     explicit RectWidget(patchid_t backgroundPatch = 0);
     virtual ~RectWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
 
     /**
      * Apply the Patch graphic referenced by @a patch as the background for this rect.

diff --git a/doomsday/plugins/common/include/menu/widgets/sliderwidget.h b/doomsday/plugins/common/include/menu/widgets/sliderwidget.h
@@ -62,12 +62,10 @@ class SliderWidget : public Widget
     explicit SliderWidget(float min = 0.0f, float max = 1.0f, float step = 0.1f, bool floatMode = true);
     virtual ~SliderWidget();
 
-    void draw(Point2Raw const *origin);
-    void updateGeometry(Page *pagePtr);
+    void draw() const;
+    void updateGeometry();
     int handleCommand(menucommand_e command);
 
-    int thumbPos() const;
-
     /**
      * Change the current value represented by the slider.
      * @param value  New value.