toggle fullscreen: also adapt GUI plane when resizing

[flightgear.git] / src / Canvas / window.hxx

diff --git a/src/Canvas/window.hxx b/src/Canvas/window.hxx
index cce5b1aa9c96792a1a8a437379bd51ba1035b2e2..a682fec895a1f3b58b3d96c02ca0b15c06e9183e 100644 (file)
--- a/src/Canvas/window.hxx
+++ b/src/Canvas/window.hxx
@@ -19,10 +19,9 @@
 #ifndef CANVAS_WINDOW_HXX_
 #define CANVAS_WINDOW_HXX_
 
-#include "property_based_element.hxx"
-#include <Canvas/elements/CanvasImage.hxx>
-#include <Canvas/MouseEvent.hxx>
-
+#include <simgear/canvas/elements/CanvasImage.hxx>
+#include <simgear/canvas/MouseEvent.hxx>
+#include <simgear/props/PropertyBasedElement.hxx>
 #include <simgear/props/propertyObject.hxx>
 
 #include <osg/Geode>
@@ -31,7 +30,7 @@
 namespace canvas
 {
   class Window:
-    public PropertyBasedElement
+    public simgear::PropertyBasedElement
   {
     public:
       Window(SGPropertyNode* node);
@@ -41,16 +40,16 @@ namespace canvas
       virtual void valueChanged (SGPropertyNode * node);
 
       osg::Group* getGroup();
-      const Rect<float>& getRegion() const;
+      const simgear::Rect<float>& getRegion() const;
 
-      void setCanvas(CanvasPtr canvas);
-      CanvasWeakPtr getCanvas() const;
+      void setCanvas(simgear::canvas::CanvasPtr canvas);
+      simgear::canvas::CanvasWeakPtr getCanvas() const;
 
-      bool handleMouseEvent(const MouseEvent& event);
+      bool handleMouseEvent(const simgear::canvas::MouseEvent& event);
 
     protected:
 
-      Image _image;
+      simgear::canvas::Image _image;
 
       void doRaise(SGPropertyNode* node_raise);
   };