comparison OrthancStone/Sources/Viewport/WebAssemblyViewport.h @ 1576:92fca2b3ba3d

sanitizing the handling of canvas size
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 24 Sep 2020 16:40:30 +0200
parents e4a52cbbdd70
children e8a120dd05bd
comparison
equal deleted inserted replaced
1575:e4a52cbbdd70 1576:92fca2b3ba3d
56 std::string canvasCssSelector_; 56 std::string canvasCssSelector_;
57 std::unique_ptr<ICompositor> compositor_; 57 std::unique_ptr<ICompositor> compositor_;
58 std::unique_ptr<ViewportController> controller_; 58 std::unique_ptr<ViewportController> controller_;
59 std::unique_ptr<IViewportInteractor> interactor_; 59 std::unique_ptr<IViewportInteractor> interactor_;
60 bool enableEmscriptenMouseEvents_; 60 bool enableEmscriptenMouseEvents_;
61 unsigned int canvasWidth_;
62 unsigned int canvasHeight_;
61 63
62 static EM_BOOL OnRequestAnimationFrame(double time, void *userData); 64 static EM_BOOL OnRequestAnimationFrame(double time, void *userData);
63 65
64 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData); 66 static EM_BOOL OnResize(int eventType, const EmscriptenUiEvent *uiEvent, void *userData);
65 67
84 86
85 void AcquireCompositor(ICompositor* compositor /* takes ownership */); 87 void AcquireCompositor(ICompositor* compositor /* takes ownership */);
86 88
87 virtual void Paint(ICompositor& compositor, 89 virtual void Paint(ICompositor& compositor,
88 ViewportController& controller) = 0; 90 ViewportController& controller) = 0;
89
90 virtual void UpdateSize(ICompositor& compositor) = 0;
91 91
92 /** 92 /**
93 The second argument is temporary and should be deleted once the migration 93 The second argument is temporary and should be deleted once the migration
94 to interactors is finished. It should be set to "true" for new applications. 94 to interactors is finished. It should be set to "true" for new applications.
95 */ 95 */
122 const std::string& GetCanvasCssSelector() const 122 const std::string& GetCanvasCssSelector() const
123 { 123 {
124 return canvasCssSelector_; 124 return canvasCssSelector_;
125 } 125 }
126 126
127
128 void RefreshCanvasSize();
129
130 unsigned int GetCanvasWidth() const
131 {
132 return canvasWidth_;
133 }
134
135 unsigned int GetCanvasHeight()
136 {
137 return canvasHeight_;
138 }
139
127 void FitForPrint(); // TODO - REMOVE 140 void FitForPrint(); // TODO - REMOVE
128 }; 141 };
129 } 142 }