Mercurial > hg > orthanc-stone
diff Samples/Shared/SharedBasicScene.cpp @ 896:875bd6aca5e6 am-dev
merge
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Fri, 12 Jul 2019 14:57:48 +0200 |
| parents | 6073c980323a 6e79e8c9021c |
| children | 9c2f6d6b9f4a |
line wrap: on
line diff
--- a/Samples/Shared/SharedBasicScene.cpp Fri Jul 12 14:57:06 2019 +0200 +++ b/Samples/Shared/SharedBasicScene.cpp Fri Jul 12 14:57:48 2019 +0200 @@ -218,7 +218,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) @@ -241,14 +241,14 @@ { case 's': { - viewportController_->FitContent(compositor_->GetWidth(), compositor_->GetHeight()); + viewportController_->FitContent(compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight()); return true; }; #if ORTHANC_SANDBOXED == 0 case 'c': { Scene2D& scene(*(viewportController_->GetScene())); - TakeScreenshot("screenshot.png", scene, compositor_->GetWidth(), compositor_->GetHeight()); + TakeScreenshot("screenshot.png", scene, compositor_->GetCanvasWidth(), compositor_->GetCanvasHeight()); return true; } #endif