raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=10cd94a953c78d4fda94c42db40798eebc743263
commit 10cd94a953c78d4fda94c42db40798eebc743263
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Wed Aug 19 19:56:02 2015 +0900
e shelf - small missing set of signals - tell theme when inset scrolls
the shelf theme actually can't know if there is scrollable content in
that direction when a shelf item has autoscroll on and has content in
that direction. this is kind of a missing theme capability that is
incredibly useful if you want to do certain kinds of themes. this is
fairly minor and i'd consider ok for e20 release as we aren't even
doing alphas yet...
---
src/bin/e_gadcon.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/bin/e_gadcon.h | 1 +
2 files changed, 59 insertions(+)
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index cf49ca8..9e8cdf0 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -13,6 +13,7 @@ static void
_e_gadcon_client_free(E_Gadcon_Client *gcc);
static void _e_gadcon_moveresize_handle(E_Gadcon_Client
*gcc);
static Eina_Bool _e_gadcon_cb_client_scroll_timer(void *data);
+static void
_e_gadcon_client_scroll_state_update(E_Gadcon_Client *gcc);
static Eina_Bool _e_gadcon_cb_client_scroll_animator(void
*data);
static void _e_gadcon_cb_client_frame_mouse_move(void
*data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_gadcon_cb_client_frame_moveresize(void
*data, Evas *e, Evas_Object *obj, void *event_info);
@@ -1004,6 +1005,9 @@ _e_gadcon_client_box_del(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_
static void
_e_gadcon_client_box_hints_changed(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
+ E_Gadcon_Client *gcc = data;
+ if (gcc->autoscroll)
+ _e_gadcon_client_scroll_state_update(gcc);
evas_object_size_hint_min_set(obj, 0, 0);
}
@@ -1455,6 +1459,8 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int
autoscroll)
gcc->aspect.h);
}
}
+ if (gcc->autoscroll)
+ _e_gadcon_client_scroll_state_update(gcc);
}
E_API void
@@ -2172,6 +2178,7 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
}
evas_object_size_hint_min_set(gcc->o_base, w, h);
evas_object_size_hint_max_set(gcc->o_base, mw, mh);
+ _e_gadcon_client_scroll_state_update(gcc);
}
static void
@@ -2204,6 +2211,52 @@ _e_gadcon_cb_client_scroll_timer(void *data)
return ECORE_CALLBACK_RENEW;
}
+static void
+_e_gadcon_client_scroll_state_update(E_Gadcon_Client *gcc)
+{
+ Evas_Coord box_w, box_h, base_w, base_h;
+
+ if (gcc->o_frame)
+ {
+ evas_object_geometry_get(gcc->o_box, NULL, NULL, &box_w, &box_h);
+ evas_object_geometry_get(gcc->o_base, NULL, NULL, &base_w, &base_h);
+
+ if (((elm_box_horizontal_get(gcc->o_box)) && (box_w >= base_w)) ||
+ ((!elm_box_horizontal_get(gcc->o_box)) && (box_h >= base_h)))
+ {
+ if (gcc->pscrollstate != 0)
+ {
+ edje_object_signal_emit(gcc->o_frame, "e,state,scroll,none",
"e");
+ gcc->pscrollstate = 0;
+ }
+ }
+ else if (gcc->scroll_pos <= 0.01)
+ {
+ if (gcc->pscrollstate != 1)
+ {
+ edje_object_signal_emit(gcc->o_frame,
"e,state,scroll,begin", "e");
+ gcc->pscrollstate = 1;
+ }
+ }
+ else if (gcc->scroll_pos >= 0.99)
+ {
+ if (gcc->pscrollstate != 3)
+ {
+ edje_object_signal_emit(gcc->o_frame, "e,state,scroll,end",
"e");
+ gcc->pscrollstate = 3;
+ }
+ }
+ else
+ {
+ if (gcc->pscrollstate != 2)
+ {
+ edje_object_signal_emit(gcc->o_frame,
"e,state,scroll,middle", "e");
+ gcc->pscrollstate = 2;
+ }
+ }
+ }
+}
+
static Eina_Bool
_e_gadcon_cb_client_scroll_animator(void *data)
{
@@ -2220,6 +2273,8 @@ _e_gadcon_cb_client_scroll_animator(void *data)
return ECORE_CALLBACK_CANCEL;
}
+ _e_gadcon_client_scroll_state_update(gcc);
+
if (gcc->scroll_cb.func)
gcc->scroll_cb.func(gcc->scroll_cb.data);
@@ -2562,6 +2617,7 @@ _e_gadcon_cb_client_resize(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj,
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
if (gcc->o_control) evas_object_resize(gcc->o_control, w, h);
if (gcc->o_event) evas_object_resize(gcc->o_event, w, h);
+ _e_gadcon_client_scroll_state_update(gcc);
}
static void
@@ -3314,6 +3370,8 @@ _e_gadcon_client_cb_menu_autoscroll(void *data, E_Menu *m
EINA_UNUSED, E_Menu_It
e_gadcon_client_autoscroll_set(gcc, gcc->autoscroll);
_e_gadcon_client_save(gcc);
e_gadcon_layout_thaw(gcc->gadcon->o_container);
+ if (gcc->autoscroll)
+ _e_gadcon_client_scroll_state_update(gcc);
}
/*
diff --git a/src/bin/e_gadcon.h b/src/bin/e_gadcon.h
index 71485d9..e709ed7 100644
--- a/src/bin/e_gadcon.h
+++ b/src/bin/e_gadcon.h
@@ -232,6 +232,7 @@ struct _E_Gadcon_Client
unsigned char hidden : 1;
E_Config_Gadcon_Client *cf;
+ char pscrollstate;
};
struct _E_Event_Gadcon_Client_Class
--
