forked from enlightenment/efl
elm_map: remove 'wheel_disabled' property
This commit is contained in:
parent
0a5b034977
commit
6b8b0301c3
|
@ -4470,7 +4470,7 @@ _elm_map_rotate_get(Eo *obj EINA_UNUSED, Elm_Map_Data *sd, double *degree, Evas_
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_elm_map_wheel_disabled_set(Eo *obj, Elm_Map_Data *sd, Eina_Bool disabled)
|
_elm_map_elm_interface_scrollable_wheel_disabled_set(Eo *obj, Elm_Map_Data *sd, Eina_Bool disabled)
|
||||||
{
|
{
|
||||||
if ((!sd->wheel_disabled) && (disabled))
|
if ((!sd->wheel_disabled) && (disabled))
|
||||||
evas_object_event_callback_del_full
|
evas_object_event_callback_del_full
|
||||||
|
@ -4479,12 +4479,7 @@ _elm_map_wheel_disabled_set(Eo *obj, Elm_Map_Data *sd, Eina_Bool disabled)
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
|
(obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
|
||||||
sd->wheel_disabled = !!disabled;
|
sd->wheel_disabled = !!disabled;
|
||||||
}
|
elm_interface_scrollable_wheel_disabled_set(efl_super(obj, ELM_MAP_CLASS), disabled);
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
|
||||||
_elm_map_wheel_disabled_get(Eo *obj EINA_UNUSED, Elm_Map_Data *sd)
|
|
||||||
{
|
|
||||||
return sd->wheel_disabled;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
|
@ -5444,6 +5439,18 @@ elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble)
|
||||||
evas_object_smart_changed(bubble->wsd->pan_obj);
|
evas_object_smart_changed(bubble->wsd->pan_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void
|
||||||
|
elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
|
||||||
|
{
|
||||||
|
elm_interface_scrollable_wheel_disabled_set(obj, disabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
EAPI Eina_Bool
|
||||||
|
elm_map_wheel_disabled_get(const Evas_Object *obj)
|
||||||
|
{
|
||||||
|
return elm_interface_scrollable_wheel_disabled_get(obj);
|
||||||
|
}
|
||||||
|
|
||||||
EOLIAN static Elm_Map_Overlay*
|
EOLIAN static Elm_Map_Overlay*
|
||||||
_elm_map_overlay_route_add(Eo *obj, Elm_Map_Data *sd, const Elm_Map_Route *route)
|
_elm_map_overlay_route_add(Eo *obj, Elm_Map_Data *sd, const Elm_Map_Route *route)
|
||||||
{
|
{
|
||||||
|
|
|
@ -82,26 +82,6 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
|
||||||
to unpause it.]]
|
to unpause it.]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@property wheel_disabled {
|
|
||||||
set {
|
|
||||||
[[Enable or disable mouse wheel to be used to zoom in / out the
|
|
||||||
map.
|
|
||||||
|
|
||||||
Wheel is enabled by default.
|
|
||||||
]]
|
|
||||||
}
|
|
||||||
get {
|
|
||||||
[[Get a value whether mouse wheel is enabled or not.
|
|
||||||
|
|
||||||
Mouse wheel can be used for the user to zoom in or zoom out
|
|
||||||
the map.
|
|
||||||
]]
|
|
||||||
}
|
|
||||||
values {
|
|
||||||
disabled: bool; [[Use $true to disable mouse wheel or $false
|
|
||||||
to enable it.]]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@property zoom_min {
|
@property zoom_min {
|
||||||
set {
|
set {
|
||||||
[[Set the minimum zoom of the source.]]
|
[[Set the minimum zoom of the source.]]
|
||||||
|
@ -550,6 +530,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Ui.Zoom.zoom_level { set; }
|
Efl.Ui.Zoom.zoom_level { set; }
|
||||||
Efl.Ui.Zoom.zoom_mode { set; }
|
Efl.Ui.Zoom.zoom_mode { set; }
|
||||||
|
Elm.Interface_Scrollable.wheel_disabled { set; }
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
press; [[Called when map was pressed]]
|
press; [[Called when map was pressed]]
|
||||||
|
|
|
@ -115,4 +115,30 @@ EAPI void elm_map_zoom_mode_set(Evas_Object *obj, Elm_Map_Zoom_Mode mode);
|
||||||
*/
|
*/
|
||||||
EAPI Elm_Map_Zoom_Mode elm_map_zoom_mode_get(const Evas_Object *obj);
|
EAPI Elm_Map_Zoom_Mode elm_map_zoom_mode_get(const Evas_Object *obj);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Enable or disable mouse wheel to be used to zoom in / out the map.
|
||||||
|
*
|
||||||
|
* Wheel is enabled by default.
|
||||||
|
*
|
||||||
|
* @param[in] obj The object.
|
||||||
|
* @param[in] disabled Use @c true to disable mouse wheel or @c false to enable
|
||||||
|
* it.
|
||||||
|
*
|
||||||
|
* @ingroup Elm_Map
|
||||||
|
*/
|
||||||
|
EAPI void elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get a value whether mouse wheel is enabled or not.
|
||||||
|
*
|
||||||
|
* Mouse wheel can be used for the user to zoom in or zoom out the map.
|
||||||
|
*
|
||||||
|
* @param[in] obj The object.
|
||||||
|
*
|
||||||
|
* @return Use @c true to disable mouse wheel or @c false to enable it.
|
||||||
|
*
|
||||||
|
* @ingroup Elm_Map
|
||||||
|
*/
|
||||||
|
EAPI Eina_Bool elm_map_wheel_disabled_get(const Evas_Object *obj);
|
||||||
|
|
||||||
#include "elm_map.eo.legacy.h"
|
#include "elm_map.eo.legacy.h"
|
||||||
|
|
Loading…
Reference in New Issue