Skip to content

Commit a1f8ba4

Browse files
committed
Fix api name and description
1 parent 2e777e8 commit a1f8ba4

File tree

9 files changed

+52
-38
lines changed

9 files changed

+52
-38
lines changed

shell/platform/tizen/channels/window_channel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class WindowChannel {
2626

2727
std::unique_ptr<MethodChannel<EncodableValue>> channel_;
2828

29-
// A reference to the renderer object managed by FlutterTizenView.s
29+
// A reference to the renderer object managed by FlutterTizenView.
3030
TizenWindow* window_;
3131
};
3232

shell/platform/tizen/flutter_tizen.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ void FlutterDesktopEngineShutdown(FlutterDesktopEngineRef engine_ref) {
7171

7272
void* FlutterDesktopPluginRegistrarGetNativeWindow(
7373
FlutterDesktopPluginRegistrarRef registrar) {
74-
auto view_base = registrar->engine->view()->tizen_view();
75-
if (view_base->GetType() == "window") {
76-
auto window = reinterpret_cast<flutter::TizenWindow*>(view_base);
74+
flutter::TizenViewBase* tizen_view_base =
75+
registrar->engine->view()->tizen_view_base();
76+
if (tizen_view_base->GetType() == "window") {
77+
auto window = reinterpret_cast<flutter::TizenWindow*>(tizen_view_base);
7778
return window->GetWindowHandle();
7879
}
7980
return nullptr;

shell/platform/tizen/flutter_tizen_ecore.cc

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
88
#include "flutter/shell/platform/tizen/flutter_tizen_view.h"
9+
#include "flutter/shell/platform/tizen/logger.h"
910
#include "flutter/shell/platform/tizen/tizen_window_ecore_wl2.h"
1011

1112
namespace {
@@ -57,18 +58,20 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromElmParent(
5758
const FlutterDesktopViewProperties& view_properties,
5859
FlutterDesktopEngineRef engine,
5960
void* parent) {
60-
// Not supported.
61-
61+
// FIXME: Ecore WL2 renderer does not support this yet.
62+
FT_UNIMPLEMENTED();
6263
return nullptr;
6364
}
6465

6566
void* FlutterDesktopViewGetEvasObject(FlutterDesktopViewRef view) {
66-
// Not supported.
67+
// FIXME: Ecore WL2 renderer does not support this yet.
68+
FT_UNIMPLEMENTED();
6769
return nullptr;
6870
}
6971

7072
void FlutterDesktopViewResizeView(FlutterDesktopViewRef view,
7173
int32_t width,
7274
int32_t height) {
73-
// Not supported.
74-
}
75+
// FIXME: Ecore WL2 renderer does not support this yet.
76+
FT_UNIMPLEMENTED();
77+
}

shell/platform/tizen/flutter_tizen_elementary.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromElmParent(
6666
};
6767

6868
std::unique_ptr<flutter::TizenViewBase> view =
69-
std::make_unique<flutter::TizenViewElementary>(view_geometry,
70-
(Evas_Object*)(parent));
69+
std::make_unique<flutter::TizenViewElementary>(
70+
view_geometry, static_cast<Evas_Object*>(parent));
7171

7272
auto flutter_view =
7373
std::make_unique<flutter::FlutterTizenView>(std::move(view));
@@ -89,7 +89,7 @@ FlutterDesktopViewRef FlutterDesktopViewCreateFromElmParent(
8989

9090
void* FlutterDesktopViewGetEvasObject(FlutterDesktopViewRef view) {
9191
auto flutter_tizen_view = reinterpret_cast<flutter::FlutterTizenView*>(view);
92-
return flutter_tizen_view->tizen_view()->GetRenderTarget();
92+
return flutter_tizen_view->tizen_view_base()->GetRenderTarget();
9393
}
9494

9595
void FlutterDesktopViewResizeView(FlutterDesktopViewRef view,
@@ -102,5 +102,5 @@ void FlutterDesktopViewResizeView(FlutterDesktopViewRef view,
102102
width,
103103
height,
104104
};
105-
flutter_tizen_view->tizen_view()->OnGeometryChanged(view_geometry);
105+
flutter_tizen_view->tizen_view_base()->OnGeometryChanged(view_geometry);
106106
}

shell/platform/tizen/flutter_tizen_engine.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ void FlutterTizenEngine::OnUpdateSemanticsCustomActions(
537537
std::shared_ptr<FlutterPlatformWindowDelegateTizen> window =
538538
FlutterPlatformAppDelegateTizen::GetInstance().GetWindow().lock();
539539
TizenViewBase::Geometry geometry =
540-
engine->view_->tizen_view()->GetRenderTargetGeometry();
540+
engine->view_->tizen_view_base()->GetRenderTargetGeometry();
541541
window->SetGeometry(geometry.left, geometry.top, geometry.width,
542542
geometry.height);
543543
window->SetRootNode(root);

shell/platform/tizen/flutter_tizen_view.cc

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ const std::vector<std::string> kBindableSystemKeys = {
4141
namespace flutter {
4242

4343
FlutterTizenView::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

4949
FlutterTizenView::~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

7575
void 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

127129
void 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

262265
void 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) {

shell/platform/tizen/flutter_tizen_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace flutter {
2020

2121
class FlutterTizenView {
2222
public:
23-
FlutterTizenView(std::unique_ptr<TizenViewBase> tizen_view_);
23+
FlutterTizenView(std::unique_ptr<TizenViewBase> tizen_view_base_);
2424

2525
~FlutterTizenView();
2626

@@ -30,7 +30,7 @@ class FlutterTizenView {
3030

3131
FlutterTizenEngine* engine() { return engine_.get(); }
3232

33-
TizenViewBase* tizen_view() { return tizen_view_.get(); }
33+
TizenViewBase* tizen_view_base() { return tizen_view_base_.get(); }
3434

3535
// Creates rendering surface for Flutter engine to draw into.
3636
// Should be called before calling FlutterEngineRun using this view.
@@ -127,7 +127,7 @@ class FlutterTizenView {
127127
std::unique_ptr<FlutterTizenEngine> engine_;
128128

129129
// The window associated with this view.
130-
std::unique_ptr<TizenViewBase> tizen_view_;
130+
std::unique_ptr<TizenViewBase> tizen_view_base_;
131131

132132
// The plugin registrar managing internal plugins.
133133
std::unique_ptr<PluginRegistrar> internal_plugin_registrar_;

shell/platform/tizen/public/flutter_tizen.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,19 @@ FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopViewCreateFromNewWindow(
144144
FlutterDesktopEngineRef engine);
145145

146146
// Creates a view that hosts and displays the given engine instance.
147+
// (@warning: This API is improving. There is no guarantee that exact result.)
147148
FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopViewCreateFromElmParent(
148149
const FlutterDesktopViewProperties& view_properties,
149150
FlutterDesktopEngineRef engine,
150151
void* parent);
151152

152153
// Returns a handle to evas object that the FlutterView is drawn to.
154+
// (@warning: This API is improving. There is no guarantee that exact result.)
153155
FLUTTER_EXPORT void* FlutterDesktopViewGetEvasObject(
154156
FlutterDesktopViewRef view);
155157

156158
// Resize the FlutterView.
159+
// (@warning: This API is improving. There is no guarantee that exact result.)
157160
FLUTTER_EXPORT void FlutterDesktopViewResizeView(FlutterDesktopViewRef view,
158161
int32_t width,
159162
int32_t height);

shell/platform/tizen/tizen_view_elementary.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ void TizenViewElementary::BindKeys(const std::vector<std::string>& keys) {
316316
// However, it is necessary to bind a special key for each profile(in this
317317
// case). This part is modified after refactoring related to the key event
318318
// code.
319-
Evas_Object* elm_win = (Evas_Object*)ecore_evas_data_get(
320-
ecore_evas_ecore_evas_get(evas_object_evas_get(image_)), "elm_win");
319+
Evas_Object* elm_win = static_cast<Evas_Object*>(ecore_evas_data_get(
320+
ecore_evas_ecore_evas_get(evas_object_evas_get(image_)), "elm_win"));
321321
if (elm_win) {
322322
for (const std::string& key : keys) {
323323
eext_win_keygrab_set(elm_win, key.c_str());

0 commit comments

Comments
 (0)