Refactor|libappfw|Client: Cleanup of the window draw operation

skyjake · Feb 13, 2014 · 048f17e · 048f17e
1 parent f32ca73
commit 048f17e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 14 deletions.
diff --git a/doomsday/client/include/ui/clientwindow.h b/doomsday/client/include/ui/clientwindow.h
@@ -157,12 +157,13 @@ class ClientWindow : public de::BaseWindow,
     void closeEvent(QCloseEvent *);
     void canvasGLReady(de::Canvas &);
     void canvasGLInit(de::Canvas &);
-    void canvasGLDraw(de::Canvas &);
     void canvasGLResized(de::Canvas &);
 
     // Implements BaseWindow:
     de::Vector2f windowContentSize();
     void drawWindowContent();
+    void preDraw();
+    void postDraw();
 
     static ClientWindow &main();
 

diff --git a/doomsday/client/src/ui/clientwindow.cpp b/doomsday/client/src/ui/clientwindow.cpp
@@ -685,15 +685,6 @@ Vector2f ClientWindow::windowContentSize()
     return Vector2f(root().viewWidth().value(), root().viewHeight().value());
 }
 
-void ClientWindow::drawWindowContent()
-{
-    LIBGUI_ASSERT_GL_OK();
-
-    root().draw();
-
-    LIBGUI_ASSERT_GL_OK();
-}
-
 ClientRootWidget &ClientWindow::root()
 {
     return d->root;
@@ -788,9 +779,10 @@ void ClientWindow::canvasGLInit(Canvas &)
     GL_Init2DState();
 }
 
-void ClientWindow::canvasGLDraw(Canvas &canvas)
+void ClientWindow::preDraw()
 {
-    // All of this occurs during the Canvas paintGL event.
+    // NOTE: This occurs during the Canvas paintGL event.
+    BaseWindow::preDraw();
 
     ClientApp::app().preFrame(); /// @todo what about multiwindow?
 
@@ -805,17 +797,27 @@ void ClientWindow::canvasGLDraw(Canvas &canvas)
         d->updateRootSize();
     }
     d->updateCompositor();
+}
 
-    d->contentXf.drawTransformed();
+void ClientWindow::drawWindowContent()
+{
+    root().draw();
+    LIBGUI_ASSERT_GL_OK();
+}
+
+void ClientWindow::postDraw()
+{
+    // NOTE: This occurs during the Canvas paintGL event.
 
     // Finish GL drawing and swap it on to the screen. Blocks until buffers
     // swapped.
     GL_DoUpdate();
 
     ClientApp::app().postFrame(); /// @todo what about multiwindow?
 
-    BaseWindow::canvasGLDraw(canvas);
     d->updateFpsNotification(frameRate());
+
+    BaseWindow::postDraw();
 }
 
 void ClientWindow::canvasGLResized(Canvas &canvas)

diff --git a/doomsday/libappfw/include/de/framework/basewindow.h b/doomsday/libappfw/include/de/framework/basewindow.h
@@ -81,6 +81,8 @@ class BaseWindow : public PersistentCanvasWindow
      */
     virtual void draw();
 
+    void canvasGLDraw(Canvas &);
+
     DENG2_AS_IS_METHODS()
 
 protected:
@@ -93,6 +95,9 @@ class BaseWindow : public PersistentCanvasWindow
      */
     virtual bool prepareForDraw();
 
+    virtual void preDraw();
+    virtual void postDraw();
+
 private:
     DENG2_PRIVATE(d)
 };

diff --git a/doomsday/libappfw/src/basewindow.cpp b/doomsday/libappfw/src/basewindow.cpp
@@ -92,4 +92,19 @@ void BaseWindow::draw()
     }
 }
 
+void BaseWindow::canvasGLDraw(Canvas &cv)
+{
+    preDraw();
+    d->xf->drawTransformed();
+    postDraw();
+
+    PersistentCanvasWindow::canvasGLDraw(cv);
+}
+
+void BaseWindow::preDraw()
+{}
+
+void BaseWindow::postDraw()
+{}
+
 } // namespace de