@@ -173,7 +173,7 @@ void TizenWindowElementary::RegisterEventHandlers() {
173173 [](void * data, Evas* evas, Evas_Object* object, void * event_info) {
174174 auto * self = reinterpret_cast <TizenWindowElementary*>(data);
175175 if (self->view_delegate_ ) {
176- if (self->elm_win_ == object) {
176+ if (self->image_ == object) {
177177 auto * mouse_event =
178178 reinterpret_cast <Evas_Event_Mouse_Down*>(event_info);
179179 self->view_delegate_ ->OnPointerDown (
@@ -184,15 +184,15 @@ void TizenWindowElementary::RegisterEventHandlers() {
184184 }
185185 };
186186 evas_object_event_callback_add (
187- elm_win_ , EVAS_CALLBACK_MOUSE_DOWN,
187+ image_ , EVAS_CALLBACK_MOUSE_DOWN,
188188 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_DOWN], this );
189189
190190 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_UP] = [](void * data, Evas* evas,
191191 Evas_Object* object,
192192 void * event_info) {
193193 auto * self = reinterpret_cast <TizenWindowElementary*>(data);
194194 if (self->view_delegate_ ) {
195- if (self->elm_win_ == object) {
195+ if (self->image_ == object) {
196196 auto * mouse_event = reinterpret_cast <Evas_Event_Mouse_Up*>(event_info);
197197 self->view_delegate_ ->OnPointerUp (
198198 mouse_event->canvas .x , mouse_event->canvas .y ,
@@ -201,15 +201,15 @@ void TizenWindowElementary::RegisterEventHandlers() {
201201 }
202202 }
203203 };
204- evas_object_event_callback_add (elm_win_ , EVAS_CALLBACK_MOUSE_UP,
204+ evas_object_event_callback_add (image_ , EVAS_CALLBACK_MOUSE_UP,
205205 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_UP],
206206 this );
207207
208208 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_MOVE] =
209209 [](void * data, Evas* evas, Evas_Object* object, void * event_info) {
210210 auto * self = reinterpret_cast <TizenWindowElementary*>(data);
211211 if (self->view_delegate_ ) {
212- if (self->elm_win_ == object) {
212+ if (self->image_ == object) {
213213 auto * mouse_event =
214214 reinterpret_cast <Evas_Event_Mouse_Move*>(event_info);
215215 self->view_delegate_ ->OnPointerMove (
@@ -220,14 +220,14 @@ void TizenWindowElementary::RegisterEventHandlers() {
220220 }
221221 };
222222 evas_object_event_callback_add (
223- elm_win_ , EVAS_CALLBACK_MOUSE_MOVE,
223+ image_ , EVAS_CALLBACK_MOUSE_MOVE,
224224 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_MOVE], this );
225225
226226 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_WHEEL] =
227227 [](void * data, Evas* evas, Evas_Object* object, void * event_info) {
228228 auto * self = reinterpret_cast <TizenWindowElementary*>(data);
229229 if (self->view_delegate_ ) {
230- if (self->elm_win_ == object) {
230+ if (self->image_ == object) {
231231 auto * wheel_event =
232232 reinterpret_cast <Ecore_Event_Mouse_Wheel*>(event_info);
233233 double delta_x = 0.0 ;
@@ -247,7 +247,7 @@ void TizenWindowElementary::RegisterEventHandlers() {
247247 }
248248 };
249249 evas_object_event_callback_add (
250- elm_win_ , EVAS_CALLBACK_MOUSE_WHEEL,
250+ image_ , EVAS_CALLBACK_MOUSE_WHEEL,
251251 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_WHEEL], this );
252252
253253 evas_object_callbacks_[EVAS_CALLBACK_KEY_DOWN] = [](void * data, Evas* evas,
@@ -305,17 +305,18 @@ void TizenWindowElementary::UnregisterEventHandlers() {
305305 rotation_changed_callback_);
306306
307307 evas_object_event_callback_del (
308- elm_win_ , EVAS_CALLBACK_MOUSE_DOWN,
308+ image_ , EVAS_CALLBACK_MOUSE_DOWN,
309309 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_DOWN]);
310310 evas_object_event_callback_del (
311- elm_win_ , EVAS_CALLBACK_MOUSE_UP,
311+ image_ , EVAS_CALLBACK_MOUSE_UP,
312312 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_UP]);
313313 evas_object_event_callback_del (
314- elm_win_ , EVAS_CALLBACK_MOUSE_MOVE,
314+ image_ , EVAS_CALLBACK_MOUSE_MOVE,
315315 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_MOVE]);
316316 evas_object_event_callback_del (
317- elm_win_ , EVAS_CALLBACK_MOUSE_WHEEL,
317+ image_ , EVAS_CALLBACK_MOUSE_WHEEL,
318318 evas_object_callbacks_[EVAS_CALLBACK_MOUSE_WHEEL]);
319+
319320 evas_object_event_callback_del (
320321 elm_win_, EVAS_CALLBACK_KEY_DOWN,
321322 evas_object_callbacks_[EVAS_CALLBACK_KEY_DOWN]);
@@ -359,7 +360,8 @@ int32_t TizenWindowElementary::GetDpi() {
359360}
360361
361362uintptr_t TizenWindowElementary::GetWindowId () {
362- return elm_win_window_id_get (elm_win_);
363+ return ecore_evas_window_get (
364+ ecore_evas_ecore_evas_get (evas_object_evas_get (elm_win_)));
363365}
364366
365367void TizenWindowElementary::SetPreferredOrientations (
0 commit comments