Skip to content

Commit 91edce9

Browse files
authored
Move BindKeys to TizenWindow (#298)
* Calls BindKeys only when the View type is window. Signed-off-by: Boram Bae <[email protected]>
1 parent b98c6b6 commit 91edce9

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

shell/platform/tizen/flutter_tizen_view.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ namespace flutter {
4545
FlutterTizenView::FlutterTizenView(std::unique_ptr<TizenViewBase> tizen_view)
4646
: tizen_view_(std::move(tizen_view)) {
4747
tizen_view_->SetView(this);
48-
tizen_view_->BindKeys(kBindableSystemKeys);
48+
49+
if (tizen_view_->GetType() == TizenViewType::kWindow) {
50+
auto* window = reinterpret_cast<TizenWindow*>(tizen_view_.get());
51+
window->BindKeys(kBindableSystemKeys);
52+
}
4953
}
5054

5155
FlutterTizenView::~FlutterTizenView() {}

shell/platform/tizen/tizen_view_base.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ class TizenViewBase {
4646
// view such as key presses, mouse position updates etc.
4747
void SetView(FlutterTizenView* view) { view_ = view; }
4848

49-
virtual void BindKeys(const std::vector<std::string>& keys) = 0;
50-
5149
virtual void ResizeWithRotation(TizenGeometry geometry, int32_t degree) = 0;
5250

5351
// FIXME

shell/platform/tizen/tizen_view_elementary.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,16 +314,6 @@ void TizenViewElementary::ResizeWithRotation(TizenGeometry geometry,
314314
renderer_evas_gl->ResizeSurface(geometry.width, geometry.height);
315315
}
316316

317-
void TizenViewElementary::BindKeys(const std::vector<std::string>& keys) {
318-
Evas_Object* elm_win = static_cast<Evas_Object*>(ecore_evas_data_get(
319-
ecore_evas_ecore_evas_get(evas_object_evas_get(parent_)), "elm_win"));
320-
if (elm_win) {
321-
for (const std::string& key : keys) {
322-
eext_win_keygrab_set(elm_win, key.c_str());
323-
}
324-
}
325-
}
326-
327317
void TizenViewElementary::Show() {
328318
evas_object_show(container_);
329319
evas_object_show(image_);

shell/platform/tizen/tizen_view_elementary.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ class TizenViewElementary : public TizenView {
3838

3939
void ResizeWithRotation(TizenGeometry geometry, int32_t angle) override;
4040

41-
void BindKeys(const std::vector<std::string>& keys) override;
42-
4341
void Show() override;
4442

4543
void OnGeometryChanged(TizenGeometry geometry) override;

shell/platform/tizen/tizen_window.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class TizenWindow : public TizenViewBase {
3030
// Returns the geometry of the display screen.
3131
virtual TizenGeometry GetScreenGeometry() = 0;
3232

33+
virtual void BindKeys(const std::vector<std::string>& keys) = 0;
34+
3335
TizenViewType GetType() override { return TizenViewType::kWindow; };
3436

3537
protected:

0 commit comments

Comments
 (0)