DPF

commit 56076b1a02ce515a0e2e7022ce5decb6c5fcf8b8
parent 409c581f29601382547a7cd3d387518b765364ef
Author: falkTX <falktx@gmail.com>
Date:   Tue, 12 Feb 2019 10:57:03 +0100

Cleanup, reorder cairo stuff to be first

Signed-off-by: falkTX <falktx@gmail.com>

Diffstat:
M
dgl/src/WidgetPrivateData.cpp
 | 
16
++++++++--------

1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dgl/src/WidgetPrivateData.cpp b/dgl/src/WidgetPrivateData.cpp
@@ -16,12 +16,12 @@
 
 #include "WidgetPrivateData.hpp"
 
-#ifdef DGL_OPENGL
-# include "../OpenGL.hpp"
-#endif
 #ifdef DGL_CAIRO
 # include "../Cairo.hpp"
 #endif
+#ifdef DGL_OPENGL
+# include "../OpenGL.hpp"
+#endif
 
 START_NAMESPACE_DGL
 
@@ -81,12 +81,16 @@ void Widget::PrivateData::display(const uint width,
     cairo_matrix_t matrix;
     cairo_get_matrix(cr, &matrix);
     cairo_translate(cr, absolutePos.getX(), absolutePos.getY());
-    // TODO: scaling with cairo
+    // TODO: scaling and cropping
 #endif
 
     // display widget
     self->onDisplay();
 
+#ifdef DGL_CAIRO
+    cairo_set_matrix(cr, &matrix);
+#endif
+
 #ifdef DGL_OPENGL
     if (needsDisableScissor)
     {
@@ -95,10 +99,6 @@ void Widget::PrivateData::display(const uint width,
     }
 #endif
 
-#ifdef DGL_CAIRO
-    cairo_set_matrix(cr, &matrix);
-#endif
-
     displaySubWidgets(width, height, scaling);
 }