@@ -41,9 +41,9 @@ const std::vector<std::string> kBindableSystemKeys = {
4141namespace flutter {
4242
4343FlutterTizenView::FlutterTizenView (std::unique_ptr<TizenViewBase> tizen_view)
44- : tizen_view_ (std::move(tizen_view)) {
45- tizen_view_ ->SetView (this );
46- tizen_view_ ->BindKeys (kBindableSystemKeys );
44+ : tizen_view_base_ (std::move(tizen_view)) {
45+ tizen_view_base_ ->SetView (this );
46+ tizen_view_base_ ->BindKeys (kBindableSystemKeys );
4747}
4848
4949FlutterTizenView::~FlutterTizenView () {}
@@ -58,8 +58,8 @@ void FlutterTizenView::SetEngine(std::unique_ptr<FlutterTizenEngine> engine) {
5858 // Set up window dependent channels.
5959 BinaryMessenger* messenger = internal_plugin_registrar_->messenger ();
6060
61- if (tizen_view_ ->GetType () == " window" ) {
62- auto window = reinterpret_cast <TizenWindow*>(tizen_view_ .get ());
61+ if (tizen_view_base_ ->GetType () == " window" ) {
62+ auto window = reinterpret_cast <TizenWindow*>(tizen_view_base_ .get ());
6363 platform_channel_ = std::make_unique<PlatformChannel>(messenger, window);
6464 window_channel_ = std::make_unique<WindowChannel>(messenger, window);
6565 } else {
@@ -69,15 +69,17 @@ void FlutterTizenView::SetEngine(std::unique_ptr<FlutterTizenEngine> engine) {
6969
7070 text_input_channel_ = std::make_unique<TextInputChannel>(
7171 internal_plugin_registrar_->messenger (),
72- tizen_view_ ->input_method_context ());
72+ tizen_view_base_ ->input_method_context ());
7373}
7474
7575void FlutterTizenView::CreateRenderSurface () {
7676 if (engine_ && engine_->renderer ()) {
77- TizenViewBase::Geometry geometry = tizen_view_->GetRenderTargetGeometry ();
78- engine_->renderer ()->CreateSurface (tizen_view_->GetRenderTarget (),
79- tizen_view_->GetRenderTargetDisplay (),
80- geometry.width , geometry.height );
77+ TizenViewBase::Geometry geometry =
78+ tizen_view_base_->GetRenderTargetGeometry ();
79+ engine_->renderer ()->CreateSurface (
80+ tizen_view_base_->GetRenderTarget (),
81+ tizen_view_base_->GetRenderTargetDisplay (), geometry.width ,
82+ geometry.height );
8183 }
8284}
8385
@@ -119,16 +121,17 @@ void FlutterTizenView::OnResize(int32_t left,
119121 std::swap (width, height);
120122 }
121123
122- tizen_view_ ->ResizeRenderTargetWithRotation ({left, top, width, height},
123- rotation_degree_);
124+ tizen_view_base_ ->ResizeRenderTargetWithRotation ({left, top, width, height},
125+ rotation_degree_);
124126 SendWindowMetrics (left, top, width, height, 0.0 );
125127}
126128
127129void FlutterTizenView::OnRotate (int32_t degree) {
128130 rotation_degree_ = degree;
129131 // Compute renderer transformation based on the angle of rotation.
130132 double rad = (360 - rotation_degree_) * M_PI / 180 ;
131- TizenViewBase::Geometry geometry = tizen_view_->GetRenderTargetGeometry ();
133+ TizenViewBase::Geometry geometry =
134+ tizen_view_base_->GetRenderTargetGeometry ();
132135 int32_t width = geometry.width ;
133136 int32_t height = geometry.height ;
134137
@@ -152,7 +155,7 @@ void FlutterTizenView::OnRotate(int32_t degree) {
152155 std::swap (width, height);
153156 }
154157
155- tizen_view_ ->ResizeRenderTargetWithRotation (
158+ tizen_view_base_ ->ResizeRenderTargetWithRotation (
156159 {geometry.left , geometry.top , width, height}, rotation_degree_);
157160
158161 // Window position does not change on rotation regardless of its orientation.
@@ -260,11 +263,14 @@ void FlutterTizenView::OnCommit(const std::string& str) {
260263}
261264
262265void FlutterTizenView::SendInitialGeometry () {
263- if (tizen_view_ ->GetType () == " window" ) {
264- auto window = reinterpret_cast <TizenWindow*>(tizen_view_ .get ());
266+ if (tizen_view_base_ ->GetType () == " window" ) {
267+ auto window = reinterpret_cast <TizenWindow*>(tizen_view_base_ .get ());
265268 OnRotate (window->GetRotation ());
266269 } else {
267- OnRotate (0 );
270+ TizenViewBase::Geometry geometry =
271+ tizen_view_base_->GetRenderTargetGeometry ();
272+ SendWindowMetrics (geometry.left , geometry.top , geometry.width ,
273+ geometry.height , 0.0 );
268274 }
269275}
270276
@@ -281,7 +287,7 @@ void FlutterTizenView::SendWindowMetrics(int32_t left,
281287#ifdef TV_PROFILE
282288 double dpi = 72.0 ;
283289#else
284- double dpi = static_cast <double >(tizen_view_ ->GetDpi ());
290+ double dpi = static_cast <double >(tizen_view_base_ ->GetDpi ());
285291#endif
286292 double scale_factor = dpi / 90.0 * kProfileFactor ;
287293 computed_pixel_ratio = std::max (scale_factor, 1.0 );
@@ -301,7 +307,8 @@ void FlutterTizenView::SendFlutterPointerEvent(
301307 size_t timestamp,
302308 FlutterPointerDeviceKind device_kind,
303309 int device_id) {
304- TizenViewBase::Geometry geometry = tizen_view_->GetRenderTargetGeometry ();
310+ TizenViewBase::Geometry geometry =
311+ tizen_view_base_->GetRenderTargetGeometry ();
305312 double new_x = x, new_y = y;
306313
307314 if (rotation_degree_ == 90 ) {
0 commit comments