Mercurial > hg > orthanc-stone
diff Samples/Shared/SharedBasicScene.cpp @ 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 | 56e4e9281076 |
| children | 875bd6aca5e6 |
line wrap: on
line diff
--- a/Samples/Shared/SharedBasicScene.cpp Wed Jul 10 11:29:53 2019 +0200 +++ b/Samples/Shared/SharedBasicScene.cpp Wed Jul 10 12:05:02 2019 +0200 @@ -214,7 +214,7 @@ } else if (event.button == GUIADAPTER_MOUSEBUTTON_RIGHT && compositor_.get() != NULL) { - currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetHeight())); + currentTracker_.reset(new ZoomSceneTracker(viewportController_, pointerEvent, compositor_->GetCanvasHeight())); } } else if (event.type == GUIADAPTER_EVENT_MOUSEMOVE) @@ -237,13 +237,13 @@ { case 's': { - viewportController_->FitContent(compositor_->GetWidth(), compositor_->GetHeight()); + viewportController_->FitContent(compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight()); return true; }; case 'c': { Scene2D& scene(*(viewportController_->GetScene())); - TakeScreenshot("screenshot.png", scene, compositor_->GetWidth(), compositor_->GetHeight()); + TakeScreenshot("screenshot.png", scene, compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight()); return true; } case 'd':