diff Framework/Scene2D/CairoCompositor.h @ 889:6e79e8c9021c am-dev

integration mainline->am-dev
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Jul 2019 12:05:02 +0200
parents 80829436ce0c 6e888cf6a48b
children 64e5f3ff6360
line wrap: on
line diff
--- a/Framework/Scene2D/CairoCompositor.h	Wed Jul 10 11:29:53 2019 +0200
+++ b/Framework/Scene2D/CairoCompositor.h	Wed Jul 10 12:05:02 2019 +0200
@@ -54,20 +54,20 @@
     
     ~CairoCompositor();
 
-    virtual unsigned int GetWidth() const
+    const CairoSurface& GetCanvas() const
+    {
+      return canvas_;
+    }
+
+    virtual unsigned int GetCanvasWidth() const
     {
       return canvas_.GetWidth();
     }
 
-    virtual unsigned int GetHeight() const
+    virtual unsigned int GetCanvasHeight() const
     {
       return canvas_.GetHeight();
     }
-
-    const CairoSurface& GetCanvas() const
-    {
-      return canvas_;
-    }
     
     void SetFont(size_t index,
                  GlyphBitmapAlphabet* dict);  // Takes ownership