summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYeongjong Lee <cleanlyj@naver.com>2018-08-08 16:05:16 +0900
committerHermet Park <hermetpark@gmail.com>2018-08-08 16:05:16 +0900
commitc0ee322aba223b3560048cdd1291f451c716c1ab (patch)
tree95c8d7d0f0afd277a6756b4dd96bfa1f70998fcf
parentbb984b566bd1f12f9c5df8ba7436dbb1151ea363 (diff)
downloadefl-c0ee322aba223b3560048cdd1291f451c716c1ab.tar.gz
elm_map: implement zoom_mode_get, zoom_level_get
Test Plan: map_example_01 Check that +,- button is working and no error message. Reviewers: zmike, Hermet Reviewed By: Hermet Subscribers: #reviewers, cedric, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6771
-rw-r--r--src/lib/elementary/elm_map.c12
-rw-r--r--src/lib/elementary/elm_map.eo4
2 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index c8ff618adc..cce6484cd3 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -4304,6 +4304,12 @@ _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd)
return obj;
}
+EOLIAN static double
+_elm_map_efl_ui_zoom_zoom_level_get(const Eo *obj EINA_UNUSED, Elm_Map_Data *sd)
+{
+ return sd->zoom;
+}
+
EOLIAN static void
_elm_map_efl_ui_zoom_zoom_level_set(Eo *obj, Elm_Map_Data *sd, double zoom)
{
@@ -4333,6 +4339,12 @@ elm_map_zoom_get(const Eo *obj)
return efl_ui_zoom_level_get(obj);
}
+EOLIAN static Efl_Ui_Zoom_Mode
+_elm_map_efl_ui_zoom_zoom_mode_get(const Eo *obj EINA_UNUSED, Elm_Map_Data *sd)
+{
+ return sd->mode;
+}
+
EOLIAN static void
_elm_map_efl_ui_zoom_zoom_mode_set(Eo *obj, Elm_Map_Data *sd, Efl_Ui_Zoom_Mode mode)
{
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index c81f78572d..1075541e64 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -533,8 +533,8 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
Efl.Access.Widget.Action.elm_actions { get; }
- Efl.Ui.Zoom.zoom_level { set; }
- Efl.Ui.Zoom.zoom_mode { set; }
+ Efl.Ui.Zoom.zoom_level { set; get; }
+ Efl.Ui.Zoom.zoom_mode { set; get; }
Elm.Interface_Scrollable.wheel_disabled { set; }
}
events {