diff Samples/Sdl/FusionMprSdl.cpp @ 882:31319fe867b9 am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 09 Jul 2019 11:46:43 +0200
parents e3c56d4f863f 80829436ce0c
children 6e79e8c9021c
line wrap: on
line diff
--- a/Samples/Sdl/FusionMprSdl.cpp	Tue Jul 09 11:41:16 2019 +0200
+++ b/Samples/Sdl/FusionMprSdl.cpp	Tue Jul 09 11:46:43 2019 +0200
@@ -135,8 +135,8 @@
     }
     // position the fixed info text in the upper right corner
     layerP->SetText(msgS.c_str());
-    double cX = compositor_->GetCanvasWidth() * (-0.5);
-    double cY = compositor_->GetCanvasHeight() * (-0.5);
+    double cX = compositor_->GetWidth() * (-0.5);
+    double cY = compositor_->GetHeight() * (-0.5);
     GetScene()->GetCanvasToSceneTransform().Apply(cX,cY);
     layerP->SetPosition(cX, cY);
   }
@@ -270,8 +270,8 @@
         }
         break;
       case SDLK_s:
-        controller_->FitContent(compositor_->GetCanvasWidth(),
-          compositor_->GetCanvasHeight());
+        controller_->FitContent(compositor_->GetWidth(),
+          compositor_->GetHeight());
         break;
 
       case SDLK_z:
@@ -309,8 +309,8 @@
       case SDLK_c:
         TakeScreenshot(
           "screenshot.png",
-          compositor_->GetCanvasWidth(),
-          compositor_->GetCanvasHeight());
+          compositor_->GetWidth(),
+          compositor_->GetHeight());
         break;
 
       default:
@@ -340,7 +340,7 @@
 
     case SDL_BUTTON_RIGHT:
       return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker
-        (controller_, e, compositor_->GetCanvasHeight()));
+        (controller_, e, compositor_->GetHeight()));
 
     case SDL_BUTTON_LEFT:
     {
@@ -372,7 +372,7 @@
             controller_, e));
         case FusionMprGuiTool_Zoom:
           return boost::shared_ptr<IFlexiblePointerTracker>(new ZoomSceneTracker(
-            controller_, e, compositor_->GetCanvasHeight()));
+            controller_, e, compositor_->GetHeight()));
         //case GuiTool_AngleMeasure:
         //  return new AngleMeasureTracker(GetScene(), e);
         //case GuiTool_CircleMeasure: