parent
f67a69f161
commit
c3a71f394d
|
@ -478,11 +478,9 @@ _e_pointer_cb_mouse_down(void *data, int type, void *event)
|
||||||
static int
|
static int
|
||||||
_e_pointer_cb_mouse_up(void *data, int type, void *event)
|
_e_pointer_cb_mouse_up(void *data, int type, void *event)
|
||||||
{
|
{
|
||||||
Ecore_Event_Mouse_Button *ev;
|
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
E_Pointer *p;
|
E_Pointer *p;
|
||||||
|
|
||||||
ev = event;
|
|
||||||
EINA_LIST_FOREACH(_e_pointers, l, p)
|
EINA_LIST_FOREACH(_e_pointers, l, p)
|
||||||
{
|
{
|
||||||
_e_pointer_active_handle(p);
|
_e_pointer_active_handle(p);
|
||||||
|
|
|
@ -737,9 +737,8 @@ static int
|
||||||
_e_smart_scrollbar_bar_v_visibility_adjust(E_Smart_Data *sd)
|
_e_smart_scrollbar_bar_v_visibility_adjust(E_Smart_Data *sd)
|
||||||
{
|
{
|
||||||
int scroll_v_vis_change = 0;
|
int scroll_v_vis_change = 0;
|
||||||
Evas_Coord w, h, vh;
|
Evas_Coord h, vh;
|
||||||
|
|
||||||
w = sd->child.w;
|
|
||||||
h = sd->child.h;
|
h = sd->child.h;
|
||||||
edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content",
|
edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content",
|
||||||
NULL, NULL, NULL, &vh);
|
NULL, NULL, NULL, &vh);
|
||||||
|
@ -876,8 +875,8 @@ _e_smart_scrollbar_bar_visibility_adjust(E_Smart_Data *sd)
|
||||||
}
|
}
|
||||||
if (changed)
|
if (changed)
|
||||||
{
|
{
|
||||||
changed |= _e_smart_scrollbar_bar_h_visibility_adjust(sd);
|
_e_smart_scrollbar_bar_h_visibility_adjust(sd);
|
||||||
changed |= _e_smart_scrollbar_bar_v_visibility_adjust(sd);
|
_e_smart_scrollbar_bar_v_visibility_adjust(sd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -158,10 +158,8 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
if (ev->button == 1)
|
if (ev->button == 1)
|
||||||
{
|
{
|
||||||
int gop = 0;
|
int gop = 0;
|
||||||
int n;
|
|
||||||
|
|
||||||
sd->down = 0;
|
sd->down = 0;
|
||||||
n = eina_list_count(sd->items);
|
|
||||||
|
|
||||||
gop = sd->pos - (sd->p1 * sd->dist);
|
gop = sd->pos - (sd->p1 * sd->dist);
|
||||||
gop = ((gop / sd->dist) * sd->dist) + (sd->p1 * sd->dist);
|
gop = ((gop / sd->dist) * sd->dist) + (sd->p1 * sd->dist);
|
||||||
|
|
|
@ -35,7 +35,6 @@ struct _E_Smart_Item
|
||||||
};
|
};
|
||||||
|
|
||||||
/* local subsystem functions */
|
/* local subsystem functions */
|
||||||
static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
|
||||||
static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||||
static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||||
static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||||
|
@ -105,16 +104,6 @@ e_slidesel_jump(Evas_Object *obj, int num)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* local subsystem functions */
|
/* local subsystem functions */
|
||||||
static void
|
|
||||||
_e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
|
||||||
{
|
|
||||||
Evas_Event_Mouse_Wheel *ev;
|
|
||||||
E_Smart_Data *sd;
|
|
||||||
|
|
||||||
sd = data;
|
|
||||||
ev = event_info;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
|
@ -144,9 +133,6 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
ev = event_info;
|
ev = event_info;
|
||||||
if (ev->button == 1)
|
if (ev->button == 1)
|
||||||
{
|
{
|
||||||
double t;
|
|
||||||
|
|
||||||
t = ecore_loop_time_get();
|
|
||||||
if (!sd->down_cancel)
|
if (!sd->down_cancel)
|
||||||
{
|
{
|
||||||
edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,off", "e");
|
edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,off", "e");
|
||||||
|
@ -270,7 +256,6 @@ _e_smart_add(Evas_Object *obj)
|
||||||
o = evas_object_rectangle_add(evas_object_evas_get(obj));
|
o = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||||
sd->event_obj = o;
|
sd->event_obj = o;
|
||||||
evas_object_color_set(o, 0, 0, 0, 0);
|
evas_object_color_set(o, 0, 0, 0, 0);
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, _e_smart_event_wheel, sd);
|
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd);
|
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_smart_event_mouse_down, sd);
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd);
|
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _e_smart_event_mouse_up, sd);
|
||||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd);
|
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_smart_event_mouse_move, sd);
|
||||||
|
|
|
@ -325,12 +325,10 @@ _e_table_smart_reconfigure(E_Smart_Data *sd)
|
||||||
}
|
}
|
||||||
if (expandw == 0)
|
if (expandw == 0)
|
||||||
{
|
{
|
||||||
x += (w - minw) / 2;
|
|
||||||
w = minw;
|
w = minw;
|
||||||
}
|
}
|
||||||
if (expandh == 0)
|
if (expandh == 0)
|
||||||
{
|
{
|
||||||
y += (h - minh) / 2;
|
|
||||||
h = minh;
|
h = minh;
|
||||||
}
|
}
|
||||||
x = sd->x;
|
x = sd->x;
|
||||||
|
|
|
@ -206,9 +206,6 @@ _e_wid_do(Evas_Object *obj)
|
||||||
static void
|
static void
|
||||||
_e_wid_activate_hook(Evas_Object *obj)
|
_e_wid_activate_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
E_Widget_Data *wd;
|
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
|
||||||
_e_wid_do(obj);
|
_e_wid_do(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ struct _E_Widget_Data
|
||||||
|
|
||||||
static void _e_wid_del_hook(Evas_Object *obj);
|
static void _e_wid_del_hook(Evas_Object *obj);
|
||||||
static void _e_wid_focus_hook(Evas_Object *obj);
|
static void _e_wid_focus_hook(Evas_Object *obj);
|
||||||
static void _e_wid_activate_hook(Evas_Object *obj);
|
|
||||||
static void _e_wid_disable_hook(Evas_Object *obj);
|
static void _e_wid_disable_hook(Evas_Object *obj);
|
||||||
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||||
static void _e_wid_value_set(Evas_Object *obj, double vx);
|
static void _e_wid_value_set(Evas_Object *obj, double vx);
|
||||||
|
@ -47,7 +46,6 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
|
||||||
|
|
||||||
e_widget_del_hook_set(obj, _e_wid_del_hook);
|
e_widget_del_hook_set(obj, _e_wid_del_hook);
|
||||||
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
|
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
|
||||||
e_widget_activate_hook_set(obj, _e_wid_activate_hook);
|
|
||||||
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
|
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
|
||||||
wd = calloc(1, sizeof(E_Widget_Data));
|
wd = calloc(1, sizeof(E_Widget_Data));
|
||||||
e_widget_data_set(obj, wd);
|
e_widget_data_set(obj, wd);
|
||||||
|
@ -201,7 +199,7 @@ _e_wid_update_standard(E_Widget_Data *wd)
|
||||||
{
|
{
|
||||||
int r, g, b;
|
int r, g, b;
|
||||||
int max, min;
|
int max, min;
|
||||||
float vx;
|
float vx = 0;
|
||||||
|
|
||||||
if (!wd->color) return;
|
if (!wd->color) return;
|
||||||
|
|
||||||
|
@ -261,7 +259,7 @@ void
|
||||||
_e_wid_update_fixed(E_Widget_Data *wd)
|
_e_wid_update_fixed(E_Widget_Data *wd)
|
||||||
{
|
{
|
||||||
int max, min;
|
int max, min;
|
||||||
float vx;
|
float vx = 0;
|
||||||
if (!wd) return;
|
if (!wd) return;
|
||||||
|
|
||||||
evas_object_gradient_clear(wd->o_grad);
|
evas_object_gradient_clear(wd->o_grad);
|
||||||
|
@ -349,14 +347,6 @@ _e_wid_focus_hook(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_e_wid_activate_hook(Evas_Object *obj)
|
|
||||||
{
|
|
||||||
E_Widget_Data *wd;
|
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_wid_disable_hook(Evas_Object *obj)
|
_e_wid_disable_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,8 +44,6 @@ _e_wid_del_hook(Evas_Object *obj)
|
||||||
if (wd->update_handler) ecore_event_handler_del(wd->update_handler);
|
if (wd->update_handler) ecore_event_handler_del(wd->update_handler);
|
||||||
EINA_LIST_FOREACH(wd->desks, l, o)
|
EINA_LIST_FOREACH(wd->desks, l, o)
|
||||||
{
|
{
|
||||||
E_Widget_Desk_Data *dd;
|
|
||||||
dd = e_widget_data_get(o);
|
|
||||||
e_thumb_icon_end(o);
|
e_thumb_icon_end(o);
|
||||||
}
|
}
|
||||||
eina_list_free(wd->desks);
|
eina_list_free(wd->desks);
|
||||||
|
|
|
@ -811,10 +811,8 @@ _e_wid_cb_item_hilight(void *data, void *data2)
|
||||||
{
|
{
|
||||||
E_Widget_Data *wd;
|
E_Widget_Data *wd;
|
||||||
Evas_Coord x, y, w, h;
|
Evas_Coord x, y, w, h;
|
||||||
E_Widget_Callback *wcb;
|
|
||||||
|
|
||||||
wd = data;
|
wd = data;
|
||||||
wcb = data2;
|
|
||||||
e_ilist_selected_geometry_get(wd->o_ilist, &x, &y, &w, &h);
|
e_ilist_selected_geometry_get(wd->o_ilist, &x, &y, &w, &h);
|
||||||
e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h);
|
e_scrollframe_child_region_show(wd->o_scrollframe, x, y, w, h);
|
||||||
}
|
}
|
||||||
|
|
|
@ -245,9 +245,6 @@ _e_wid_do(Evas_Object *obj)
|
||||||
static void
|
static void
|
||||||
_e_wid_activate_hook(Evas_Object *obj)
|
_e_wid_activate_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
E_Widget_Data *wd;
|
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
|
||||||
_e_wid_do(obj);
|
_e_wid_do(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,6 @@ struct _E_Widget_Data
|
||||||
|
|
||||||
static void _e_wid_del_hook(Evas_Object *obj);
|
static void _e_wid_del_hook(Evas_Object *obj);
|
||||||
static void _e_wid_focus_hook(Evas_Object *obj);
|
static void _e_wid_focus_hook(Evas_Object *obj);
|
||||||
static void _e_wid_activate_hook(Evas_Object *obj);
|
|
||||||
static void _e_wid_disable_hook(Evas_Object *obj);
|
static void _e_wid_disable_hook(Evas_Object *obj);
|
||||||
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||||
|
|
||||||
|
@ -42,7 +41,6 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv)
|
||||||
|
|
||||||
e_widget_del_hook_set(obj, _e_wid_del_hook);
|
e_widget_del_hook_set(obj, _e_wid_del_hook);
|
||||||
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
|
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
|
||||||
e_widget_activate_hook_set(obj, _e_wid_activate_hook);
|
|
||||||
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
|
e_widget_disable_hook_set(obj, _e_wid_disable_hook);
|
||||||
|
|
||||||
wd = calloc(1, sizeof(E_Widget_Data));
|
wd = calloc(1, sizeof(E_Widget_Data));
|
||||||
|
@ -93,7 +91,7 @@ void
|
||||||
e_widget_spectrum_update(Evas_Object *obj, int redraw)
|
e_widget_spectrum_update(Evas_Object *obj, int redraw)
|
||||||
{
|
{
|
||||||
E_Widget_Data *wd;
|
E_Widget_Data *wd;
|
||||||
double vx, vy;
|
double vx = 0, vy = 0;
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
wd = e_widget_data_get(obj);
|
||||||
/* redraw spectrum */
|
/* redraw spectrum */
|
||||||
|
@ -130,7 +128,6 @@ e_widget_spectrum_update(Evas_Object *obj, int redraw)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
edje_object_part_drag_value_set(wd->o_edje, "cursor", vx, vy);
|
edje_object_part_drag_value_set(wd->o_edje, "cursor", vx, vy);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -189,15 +186,6 @@ _e_wid_focus_hook(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
_e_wid_activate_hook(Evas_Object *obj)
|
|
||||||
{
|
|
||||||
E_Widget_Data *wd;
|
|
||||||
|
|
||||||
wd = e_widget_data_get(obj);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_wid_disable_hook(Evas_Object *obj)
|
_e_wid_disable_hook(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1046,9 +1046,7 @@ static void
|
||||||
_e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
|
_e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
|
||||||
{
|
{
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
Evas_Event_Mouse_Up *ev;
|
|
||||||
|
|
||||||
ev = (Evas_Event_Mouse_Up *)event_info;
|
|
||||||
zone = data;
|
zone = data;
|
||||||
if (zone->cur_mouse_action)
|
if (zone->cur_mouse_action)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue