[EGIT] [core/elementary] master 05/08: elm_scroller: add wheel_disable_set API
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f69cb53594f969b2a7d07bfe24f2d8eb43d44faa
commit f69cb53594f969b2a7d07bfe24f2d8eb43d44faa
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Mon Jun 22 11:57:51 2015 +0200
elm_scroller: add wheel_disable_set API
Summary:
This API can be used by widgets like Genlist/Gengrid, which implements
Elm_Interface_Scrollable interface.Mouse wheel is used to scroll up and
down on widget.
@feature
Test Plan: elementary_test - Scroller - Wheel Disable
Reviewers: raster, Hermet, cedric, SanghyeonLee, singh.amitesh
Subscribers: JackDanielZ, herdsman, cedric, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2715
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/bin/test_scroller.c | 17 -
src/lib/elm_scroller.c| 18 ++
src/lib/elm_scroller_legacy.h | 33 +
3 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 23b2e32..4c01508 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -135,6 +135,15 @@ _my_bt_loop_y_axis(void *data, Evas_Object *obj
EINA_UNUSED,
}
static void
+_my_bt_wheel_disable_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ Evas_Object *scroller = (Evas_Object *)data;
+
+ elm_scroller_wheel_disabled_set(scroller, elm_check_state_get(obj));
+}
+
+static void
_page_change_cb(void *data EINA_UNUSED,
Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -174,7 +183,7 @@ void
test_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *win, *bg2, *tb, *tb2, *sc, *bt, *ck1, *ck2, *bx, *bx2, *fr,
- *ck3, *ck4, *ck5, *ck6, *ck7;
+ *ck3, *ck4, *ck5, *ck6, *ck7, *ck8;
int i, j, n;
char buf[PATH_MAX];
Evas_Coord x = 0, y = 0, w = 0, h = 0;
@@ -246,6 +255,11 @@ test_scroller(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
elm_box_pack_end(bx2, ck7);
evas_object_show(ck7);
+ ck8 = elm_check_add(win);
+ elm_object_text_set(ck8, Wheel Disable);
+ elm_box_pack_end(bx2, ck8);
+ evas_object_show(ck8);
+
sc = elm_scroller_add(win);
evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -290,6 +304,7 @@ test_scroller(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_
evas_object_smart_callback_add(ck5, changed, _my_bt_snap_to_pages, sc);
evas_object_smart_callback_add(ck6, changed, _my_bt_loop_x_axis, sc);
evas_object_smart_callback_add(ck7, changed, _my_bt_loop_y_axis, sc);
+ evas_object_smart_callback_add(ck8, changed, _my_bt_wheel_disable_cb, sc);
bt = elm_spinner_add(win);
elm_spinner_min_max_set(bt, 0, 500);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 2e174c9..00f18b8 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -1284,6 +1284,24 @@ elm_scroller_loop_get(const Evas_Object *obj,
eo_do(obj, elm_interface_scrollable_loop_get(loop_h, loop_v));
}
+EAPI void
+elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled)
+{
+ ELM_SCROLLABLE_CHECK(obj);
+
+ eo_do((Eo *)obj, elm_interface_scrollable_wheel_disabled_set(disabled));
+}
+
+EAPI Eina_Bool
+elm_scroller_wheel_disabled_get(const Evas_Object *obj)
+{
+ ELM_SCROLLABLE_CHECK(obj, EINA_FALSE);
+
+ Eina_Bool ret;
+
+ return eo_do_ret((Eo *) obj, ret,
elm_interface_scrollable_wheel_disabled_get());
+}
+
EOLIAN static void
_elm_scroller_propagate_events_set(Eo *obj, Elm_Scroller_Data *_pd
EINA_UNUSED, Eina_Bool propagation)
{
diff --git a/src/lib/elm_scroller_legacy.h b/src/lib/elm_scroller_legacy.h
index bf4d361..576ea6c 100644
--- a/src/lib/elm_scroller_legacy.h
+++ b/src/lib/elm_scroller_legacy.h
@@ -525,3 +525,36 @@ EAPI void
elm_scroller_loop_set(Evas_Object *obj, Eina_
* @ingroup Scroller
*/
EAPI void elm_scroller_loop_get(const Evas_Object
*obj, Eina_Bool *loop_h, Eina_Bool *loop_v);
+
+/**
+ * @brief Enable or disable mouse wheel to be used to scroll the scroller.
+ *
+ * @param obj The scroller object
+ * @param disabled The mouse wheel disabled over the scroller.
+ *
+ * Mouse wheel can be used to scroll up and down the scroller.
+ * Wheel is enabled by default.
+ *
+ * @since 1.15
+ *
+ * @see elm_scroller_wheel_disabled_get()
+ *
+ * @ingroup Scroller
+ */
+ EAPI void
elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled);
+
+ /**
+ * @brief Get a value whether mouse wheel is enabled or not over the scroller.
+ *
+ * @param obj The scroller object
+ * @return @c EINA_TRUE means
[EGIT] [core/elementary] master 01/02: Genlist: Test case added in Genlist Focus example.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2113cafeac7b032526ce0df072467259354948bf
commit 2113cafeac7b032526ce0df072467259354948bf
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Thu Jun 25 13:24:21 2015 +0900
Genlist: Test case added in Genlist Focus example.
Summary:
Added test case to enable/disable mouse wheel. Mouse Wheel is
used to scroll the genlist up/down.
Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Test Plan: elementary_test - Genlist Focus - Wheel Disabled
Reviewers: raster, Hermet, cedric
Subscribers: sachin.dev, singh.amitesh, SanghyeonLee, eagleeye
Differential Revision: https://phab.enlightenment.org/D2757
---
src/bin/test_genlist.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 770905b..e519681 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -4273,6 +4273,13 @@ _gl_first_item_focus_on_first_focus_in_cb(void *data
EINA_UNUSED, Evas_Object *o
{
elm_config_first_item_focus_on_first_focusin_set(elm_check_state_get(obj));
}
+
+static void
+_gl_wheel_disabled_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ elm_scroller_wheel_disabled_set(data, elm_check_state_get(obj));
+}
+
static Eina_Bool
_focus_timer_cb(void *data)
{
@@ -4493,6 +4500,14 @@ _test_genlist_focus_option_panel_create(Evas_Object
*win, Evas_Object *bx,
elm_box_pack_end(bx_opt, chk);
evas_object_show(chk);
+ chk = elm_check_add(bx_opt);
+ elm_object_text_set(chk, Wheel Disabled);
+ elm_check_state_set(chk, elm_scroller_wheel_disabled_get(gl));
+ evas_object_size_hint_weight_set(chk, EVAS_HINT_EXPAND, 0.0);
+ evas_object_smart_callback_add(chk, changed, _gl_wheel_disabled_cb, gl);
+ elm_box_pack_end(bx_opt, chk);
+ evas_object_show(chk);
+
// Focus Autoscroll Mode
fr = _focus_autoscroll_mode_frame_create(bx);
elm_box_pack_end(bx, fr);
--
[EGIT] [core/elementary] master 02/02: Scroller: Remove white-spaces in scroller.edc file
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=175ca45813ef7749551568e9f1518403892ae68b
commit 175ca45813ef7749551568e9f1518403892ae68b
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Thu Jun 25 13:44:46 2015 +0900
Scroller: Remove white-spaces in scroller.edc file
Summary: Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Reviewers: cedric, raster, seoz
Differential Revision: https://phab.enlightenment.org/D2744
---
data/themes/edc/elm/scroller.edc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 4e19b0b..f1a57f6 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -58,7 +58,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_down, x,y,w, h);
get_geometry(PART:y_vbar_down_mapper, x1,y1,w1, h1);
- if((y+h) == (y1+h1) )
+ if((y+h) == (y1+h1))
{
set_state(PART:arrow2_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a2, hidden, 0.0);
@@ -69,7 +69,7 @@ group { name: elm/scroller/base/default;
set_state(PART:sb_vbar_a2, default, 0.0);
}
- if( val 10)
+ if(val 10)
timer(0.1,action_on_pos_vbar, val+1);
}
@@ -104,7 +104,7 @@ group { name: elm/scroller/base/default;
set_state(PART:sb_hbar_a2, default, 0.0);
}
- if( val 10)
+ if(val 10)
timer(0.1,action_on_pos_hbar, val+1);
}
}
--
[EGIT] [core/elementary] master 01/01: Scroller : Remove white-spaces in header file.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=47b380a1d979b4d0c0ce5718272c80bb492aeb01 commit 47b380a1d979b4d0c0ce5718272c80bb492aeb01 Author: Umesh Tanwar umesh.tan...@samsung.com Date: Thu Jun 25 13:47:17 2015 +0900 Scroller : Remove white-spaces in header file. Summary: Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com Reviewers: cedric, raster, seoz, Hermet Subscribers: sachin.dev, singh.amitesh Differential Revision: https://phab.enlightenment.org/D2741 --- src/lib/elm_scroller_legacy.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_scroller_legacy.h b/src/lib/elm_scroller_legacy.h index 576ea6c..ed70cb4 100644 --- a/src/lib/elm_scroller_legacy.h +++ b/src/lib/elm_scroller_legacy.h @@ -531,7 +531,7 @@ EAPI void elm_scroller_loop_get(const Evas_Object *obj, * * @param obj The scroller object * @param disabled The mouse wheel disabled over the scroller. - * + * * Mouse wheel can be used to scroll up and down the scroller. * Wheel is enabled by default. * @@ -539,11 +539,11 @@ EAPI void elm_scroller_loop_get(const Evas_Object *obj, * * @see elm_scroller_wheel_disabled_get() * - * @ingroup Scroller + * @ingroup Scroller */ - EAPI void elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled); +EAPI void elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled); - /** +/** * @brief Get a value whether mouse wheel is enabled or not over the scroller. * * @param obj The scroller object @@ -555,6 +555,6 @@ EAPI void elm_scroller_loop_get(const Evas_Object *obj, * * @see elm_scroller_wheel_disabled_set() * - * @ingroup Scroller + * @ingroup Scroller */ - EAPI Eina_Bool elm_scroller_wheel_disabled_get(const Evas_Object *obj); +EAPI Eina_Bool elm_scroller_wheel_disabled_get(const Evas_Object *obj); --
[EGIT] [core/elementary] master 01/01: Elm_Interface_Scrollable: Improvement in looping behavior
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=bba4c217f2ce4f032fca6298cc8b2fc6ff3d7c19
commit bba4c217f2ce4f032fca6298cc8b2fc6ff3d7c19
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Wed Jul 1 11:14:42 2015 +0900
Elm_Interface_Scrollable: Improvement in looping behavior
Summary:
x and y position variable assumes values ranging from min to max.
cw, the content width is larger than max in x axis. Beacause of this
the scroller is not able to loop in rigth/bottom direction. For looping
comparision min and max values should be used instead of content width.
@fix
Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Reviewers: raster, seoz, cedric, Hermet
Reviewed By: Hermet
Subscribers: eagleeye, SanghyeonLee, singh.amitesh, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2731
---
src/lib/elm_interface_scrollable.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 4adebcd..2c23f00 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1515,13 +1515,13 @@ _elm_interface_scrollable_content_pos_set(Eo *obj,
Elm_Scrollable_Smart_Interfac
if (sid-loop_h cw 0)
{
-if (x 0) x = cw + (x % cw);
-else if (x = cw) x = (x % cw);
+if (x minx) x = mx + (x % mx);
+else if (x mx) x = (x % mx);
}
if (sid-loop_v ch 0)
{
-if (y 0) y = ch + (y % ch);
-else if (y = ch) y = (y % ch);
+if (y miny) y = my + (y % my);
+else if (y my) y = (y % my);
}
if (!_elm_config-thumbscroll_bounce_enable)
--
[EGIT] [core/elementary] master 01/01: Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6e5c7506c73cc00018eb44096c2c5634b690b165
commit 6e5c7506c73cc00018eb44096c2c5634b690b165
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Fri Aug 7 16:51:41 2015 +0900
Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
Summary:
When the scroller size changes by dragging the
corners, the calculations will miss the condition x+w == x1 + w1.
This is because of format specific computer calculations. So,
improvisation is made in comparisons.
@ fix
Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Test Plan:
elementary_test - scroller - scroll to the extreme right (right arrow
brightness changes).
Now, drag the lower right corner to increase the width of scroller. Drag
the corner slowly to see the issue clearly.
The arrow brightness changes alternatively, instead the hbar is positioned
to the extreme right.
Reviewers: Hermet, cedric, raster
Subscribers: singh.amitesh, eagleeye, SanghyeonLee, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2796
---
data/themes/edc/elm/scroller.edc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index f1a57f6..cf1cb99 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -44,7 +44,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_up, x,y,w, h);
get_geometry(PART:y_vbar_up_mapper, x1,y1,w1, h1);
- if(y == y1)
+ if((y1 = y) (y = (y1 + h1)))
{
set_state(PART:arrow1_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a1, hidden, 0.0);
@@ -58,7 +58,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_down, x,y,w, h);
get_geometry(PART:y_vbar_down_mapper, x1,y1,w1, h1);
- if((y+h) == (y1+h1))
+ if((y1 = (y + h)) ((y+ h) = (y1 + h1)))
{
set_state(PART:arrow2_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a2, hidden, 0.0);
@@ -79,7 +79,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_left, x,y,w, h);
get_geometry(PART:x_hbar_left_mapper, x1,y1,w1, h1);
- if(x == x1)
+ if((x1 = x) (x = (x1 + w1)))
{
set_state(PART:arrow1_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a1, hidden, 0.0);
@@ -93,7 +93,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_right, x,y,w, h);
get_geometry(PART:x_hbar_right_mapper, x1,y1,w1, h1);
- if((x+w) == (x1+w1))
+ if((x1 = (x + w)) ((x + w) = (x1 + w1)))
{
set_state(PART:arrow2_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a2, hidden, 0.0);
--
[EGIT] [core/elementary] elementary-1.15 01/01: Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=096753e27e827befecd950d2ee7dca5028d8ea38
commit 096753e27e827befecd950d2ee7dca5028d8ea38
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Fri Aug 7 16:51:41 2015 +0900
Theme: Scroller.edc-Improvement in left/right/top/bottom arrow behavior.
Summary:
When the scroller size changes by dragging the
corners, the calculations will miss the condition x+w == x1 + w1.
This is because of format specific computer calculations. So,
improvisation is made in comparisons.
@ fix
Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Test Plan:
elementary_test - scroller - scroll to the extreme right (right arrow
brightness changes).
Now, drag the lower right corner to increase the width of scroller. Drag
the corner slowly to see the issue clearly.
The arrow brightness changes alternatively, instead the hbar is positioned
to the extreme right.
Reviewers: Hermet, cedric, raster
Subscribers: singh.amitesh, eagleeye, SanghyeonLee, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2796
---
data/themes/edc/elm/scroller.edc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index f1a57f6..cf1cb99 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -44,7 +44,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_up, x,y,w, h);
get_geometry(PART:y_vbar_up_mapper, x1,y1,w1, h1);
- if(y == y1)
+ if((y1 = y) (y = (y1 + h1)))
{
set_state(PART:arrow1_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a1, hidden, 0.0);
@@ -58,7 +58,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_down, x,y,w, h);
get_geometry(PART:y_vbar_down_mapper, x1,y1,w1, h1);
- if((y+h) == (y1+h1))
+ if((y1 = (y + h)) ((y+ h) = (y1 + h1)))
{
set_state(PART:arrow2_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a2, hidden, 0.0);
@@ -79,7 +79,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_left, x,y,w, h);
get_geometry(PART:x_hbar_left_mapper, x1,y1,w1, h1);
- if(x == x1)
+ if((x1 = x) (x = (x1 + w1)))
{
set_state(PART:arrow1_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a1, hidden, 0.0);
@@ -93,7 +93,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_right, x,y,w, h);
get_geometry(PART:x_hbar_right_mapper, x1,y1,w1, h1);
- if((x+w) == (x1+w1))
+ if((x1 = (x + w)) ((x + w) = (x1 + w1)))
{
set_state(PART:arrow2_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a2, hidden, 0.0);
--
[EGIT] [core/elementary] master 01/01: Scroller: Scroll indicatin arrows should be enable if loop is set.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4298e69a26398308bdcc55dbaa4dccade4e609d4
commit 4298e69a26398308bdcc55dbaa4dccade4e609d4
Author: Umesh Tanwar umesh.tan...@samsung.com
Date: Fri Aug 28 20:40:43 2015 +0900
Scroller: Scroll indicatin arrows should be enable if loop is set.
Summary:
When loop is set, the arrows on horizontal/vertical bar
should not be disabled. These arrows show the scrollable direction,
if enabled. Disabled arrows show no more scroll in that direction.
Signed-off-by: Umesh Tanwar umesh.tan...@samsung.com
Merge branch 'master' of http://git.enlightenment.org/core/elementary
Test Plan: elementary_test - scroller - loop in x axis.
Reviewers: raster, Hermet, singh.amitesh
Subscribers: sachin.dev, SanghyeonLee, eagleeye
Differential Revision: https://phab.enlightenment.org/D2953
---
data/themes/edc/elm/scroller.edc | 37 +
src/lib/elm_interface_scrollable.c | 10 ++
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index 2f3d699..34fa910 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -38,13 +38,14 @@ group { name: elm/scroller/base/default;
data.item: focus_highlight on;
script {
+ public loop_x, loop_y;
public action_on_pos_vbar(val) {
new x, y , w, h, x1, y1 , w1, h1;
get_geometry(PART:y_vbar_up, x,y,w, h);
get_geometry(PART:y_vbar_up_mapper, x1,y1,w1, h1);
- if((y1 = y) (y = (y1 + h1)))
+ if(((y1 = y) (y = (y1 + h1))) (0 == get_int(loop_y)))
{
set_state(PART:arrow1_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a1, hidden, 0.0);
@@ -58,7 +59,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:y_vbar_down, x,y,w, h);
get_geometry(PART:y_vbar_down_mapper, x1,y1,w1, h1);
- if((y1 = (y + h)) ((y+ h) = (y1 + h1)))
+ if(((y1 = (y + h)) ((y+ h) = (y1 + h1))) (0 ==
get_int(loop_y)))
{
set_state(PART:arrow2_vbar, hidden, 0.0);
set_state(PART:sb_vbar_a2, hidden, 0.0);
@@ -79,7 +80,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_left, x,y,w, h);
get_geometry(PART:x_hbar_left_mapper, x1,y1,w1, h1);
- if((x1 = x) (x = (x1 + w1)))
+ if(((x1 = x) (x = (x1 + w1))) (0 == get_int(loop_x)))
{
set_state(PART:arrow1_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a1, hidden, 0.0);
@@ -93,7 +94,7 @@ group { name: elm/scroller/base/default;
get_geometry(PART:x_hbar_right, x,y,w, h);
get_geometry(PART:x_hbar_right_mapper, x1,y1,w1, h1);
- if((x1 = (x + w)) ((x + w) = (x1 + w1)))
+ if(((x1 = (x + w)) ((x + w) = (x1 + w1))) (0 ==
get_int(loop_x)))
{
set_state(PART:arrow2_hbar, hidden, 0.0);
set_state(PART:sb_hbar_a2, hidden, 0.0);
@@ -387,6 +388,20 @@ group { name: elm/scroller/base/default;
action_on_pos_vbar(10);
}
}
+ program { name: loop_set_vbar;
+ signal: elm,loop_y,set; source: elm;
+ script {
+set_int(loop_y, 1);
+action_on_pos_vbar(10);
+ }
+ }
+ program { name: loop_unset_vbar;
+ signal: elm,loop_y,unset; source: elm;
+ script {
+set_int(loop_y, 0);
+action_on_pos_vbar(10);
+ }
+ }
// horiz bar /
part { name: sb_hbar_show; type: RECT;
@@ -659,6 +674,20 @@ group { name: elm/scroller/base/default;
action_on_pos_hbar(10);
}
}
+ program { name: loop_set_hbar;
+ signal: elm,loop_x,set; source: elm;
+ script {
+set_int(loop_x, 1);
+action_on_pos_hbar(10);
+ }
+ }
+ program { name: loop_unset_hbar;
+ signal: elm,loop_x,unset; source: elm;
+ script {
+set_int(loop_x, 0);
+action_on_pos_hbar(10);
+ }
+ }
part { name: bg; type: RECT;
description { state: default 0.0;
rel1.to: elm.swallow.background;
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 27a46c1..914fc9a 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -4450,6 +4450,16 @@ _elm_interface_scrollable_loop_set(Eo *obj EINA_UNUSED,
Elm_Scrollable_Smart_Int
sid-loop_h = loop_h;
sid-loop_v = loop_v;
+
+ if(sid-loop_h)
+ edje_object_signal_emit(sid-edje_obj, elm,loop_x,set, elm);
+ else
+ edje_object_signal_emit(sid-edje_obj, elm,loop_x,unset, elm);
+
+ if(sid-loop_v
[EGIT] [core/elementary] master 03/03: gengrid: fix Logic in _item_single_select_left and _item_single_select_right.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3bed41e7e4a2f12848b24fae18bc50fe486cb2c4
commit 3bed41e7e4a2f12848b24fae18bc50fe486cb2c4
Author: Umesh Tanwar <umesh.tan...@samsung.com>
Date: Mon Dec 7 15:55:33 2015 -0800
gengrid: fix Logic in _item_single_select_left and
_item_single_select_right.
Summary:
In _item_single_select_left/right functions if logic is corrected from &&
to ||.
The previous thing is like: if "there is a generation mismatch" and "item is
disable" then only get the next gengrid item. This seems logically
incorrect.
The suggested logic is if "there is generation mismatch" OR "item disabled"
then
go for the new item. Whether we get a generation mismatch or item disable,
we
should look for next item. So there should be || logic instead of && logic.
@fix
Signed-off-by: Umesh Tanwar <umesh.tan...@samsung.com>
Reviewers: Hermet, raster, singh.amitesh, SanghyeonLee, cedric
Subscribers: cedric, sachin.dev
Differential Revision: https://phab.enlightenment.org/D3354
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/elm_gengrid.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 3c6018e..093f5e4 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2366,8 +2366,8 @@ _item_single_select_left(Elm_Gengrid_Data *sd)
if (!sd->selected)
{
prev = ELM_GEN_ITEM_FROM_INLIST(sd->items->last);
-while ((prev) && (prev->generation < sd->generation)
- && elm_object_item_disabled_get(EO_OBJ(prev)))
+while (((prev) && (prev->generation < sd->generation))
+ || elm_object_item_disabled_get(EO_OBJ(prev)))
prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev);
}
else
@@ -2400,8 +2400,8 @@ _item_single_select_right(Elm_Gengrid_Data *sd)
if (!sd->selected)
{
next = ELM_GEN_ITEM_FROM_INLIST(sd->items);
-while ((next) && (next->generation < sd->generation)
- && elm_object_item_disabled_get(EO_OBJ(next)))
+while (((next) && (next->generation < sd->generation))
+ || elm_object_item_disabled_get(EO_OBJ(next)))
next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next);
}
else
--
[EGIT] [core/elementary] master 03/03: elementary_test: remove wrong usage of EINA_UNUSED.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f381c2d26bc73991f60f21604615821d44d2ff2b
commit f381c2d26bc73991f60f21604615821d44d2ff2b
Author: Umesh Tanwar <umesh.tan...@samsung.com>
Date: Wed Jan 6 11:27:10 2016 -0800
elementary_test: remove wrong usage of EINA_UNUSED.
Summary:
If argument variable is not used in function, then only
that variable should be declared as EINA_UNUSED.
Signed-off-by: Umesh Tanwar <umesh.tan...@samsung.com>
@fix
Reviewers: Hermet, singh.amitesh
Subscribers: sachin.dev
Differential Revision: https://phab.enlightenment.org/D3525
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/bin/test_transit.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index 9a04fb5..fb4e524 100644
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -115,7 +115,7 @@ _transit_del_cb(void *data, Elm_Transit *transit
EINA_UNUSED)
}
static void
-_transit_image_animation(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+_transit_image_animation(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Eina_List *images = NULL;
char buf[PATH_MAX];
@@ -145,7 +145,7 @@ _transit_image_animation(void *data, Evas_Object *obj
EINA_UNUSED, void *event_i
}
static void
-_transit_resizing(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+_transit_resizing(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Elm_Transit *trans;
@@ -175,7 +175,7 @@ _transit_flip(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
static void
-_transit_zoom(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+_transit_zoom(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
Elm_Transit *trans;
--
[EGIT] [core/elementary] master 02/02: elm_widget: update child object focus_order.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b78720016a9023cb57ec2a05c8cfbdf6eeae600f
commit b78720016a9023cb57ec2a05c8cfbdf6eeae600f
Author: Umesh Tanwar <umesh.tan...@samsung.com>
Date: Fri Mar 18 11:56:59 2016 -0700
elm_widget: update child object focus_order.
Summary:
_parent_focus() when called recursively updates the
sd->focus_order for parent obeject only. The sibling's sd->focus_order
not get updated.
So updated the focus_order for siblings.
Signed-off-by: Umesh Tanwar <umesh.tan...@samsung.com>
Test Plan:
{F30149}
correct case:
1. Press Enter key on click button. A popoup will come.
2. Pressing enter key on popup button the popup hides and focus goes back
to click button.
issue case:
1. Press Enter key on click button. A popoup will come.
2. press Alt+tab twice.
3. Pressing enter key on popup button the popup hides and focus does not go
back to click button.
Reviewers: raster, cedric
Subscribers: singh.amitesh
Differential Revision: https://phab.enlightenment.org/D3807
---
src/lib/elm_widget.c | 23 +++
1 file changed, 23 insertions(+)
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index b110f32..4121519 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -792,6 +792,27 @@ _elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED,
Elm_Widget_Smart_Data
}
static void
+_child_focus_order_update(Evas_Object* parent, Evas_Object* obj)
+{
+ const Eina_List *l;
+ Evas_Object *child;
+ ELM_WIDGET_DATA_GET(parent, sdp);
+ EINA_LIST_FOREACH(sdp->subobjs, l, child)
+ {
+if (!_elm_widget_is(child) || (child == obj)) continue;
+ ELM_WIDGET_DATA_GET(child,sdc);
+
+if(sdc->can_focus || (sdc->child_can_focus))
+ {
+ focus_order++;
+sdc->focus_order = focus_order;
+ }
+ _child_focus_order_update(child, NULL);
+ }
+
+}
+
+static void
_parent_focus(Evas_Object *obj, Elm_Object_Item *item)
{
API_ENTRY return;
@@ -820,6 +841,8 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item)
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
_elm_access_highlight_set(obj);
+
+ if (o) _child_focus_order_update(o, obj);
}
static void
--
[EGIT] [core/elementary] master 01/03: theme: fix non-fixed parts.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ec3ca5819f4d91bf6d1bfa5b88d85a4ef57a5d0c
commit ec3ca5819f4d91bf6d1bfa5b88d85a4ef57a5d0c
Author: Umesh Tanwar <umesh.tan...@samsung.com>
Date: Tue Mar 22 15:03:37 2016 -0700
theme: fix non-fixed parts.
Summary:
The error shown while testing elementary_test.
Signed-off-by: Umesh Tanwar <umesh.tan...@samsung.com>
Test Plan:
run elementary_test ->type "genlist" in search
->move to "genlist focus" button using navigation keys.
Reviewers: cedric, singh.amitesh, Hermet
Differential Revision: https://phab.enlightenment.org/D3815
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
data/themes/edc/elm/focus.edc | 1 +
data/themes/edc/elm/genlist.edc | 1 +
2 files changed, 2 insertions(+)
diff --git a/data/themes/edc/elm/focus.edc b/data/themes/edc/elm/focus.edc
index 789a73a..2ea2804 100644
--- a/data/themes/edc/elm/focus.edc
+++ b/data/themes/edc/elm/focus.edc
@@ -73,6 +73,7 @@ group { name: "elm/focus_highlight/top/default";
parts {
part { name: "base"; type: SPACER;
description { state: "default" 0.0;
+fixed: 1 1;
}
}
part { name: "clip"; type: RECT;
diff --git a/data/themes/edc/elm/genlist.edc b/data/themes/edc/elm/genlist.edc
index 3eab7ff..d13d6f6 100644
--- a/data/themes/edc/elm/genlist.edc
+++ b/data/themes/edc/elm/genlist.edc
@@ -1699,6 +1699,7 @@ group { "elm/genlist/tree/tree_effect/default"; nomouse;
rect { "point"; mouse;
scale;
desc { "default";
+fixed: 1 1;
color: 0 0 0 0;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 0.0;
--
[EGIT] [core/efl] master 01/01: ecore_evas: when window resized in ecore_evas, check evas rotate state.
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=67684dec73abe4c1fe00b133cf790d5bec9e8154 commit 67684dec73abe4c1fe00b133cf790d5bec9e8154 Author: Umesh Tanwar Date: Wed Jul 18 08:10:21 2018 -0400 ecore_evas: when window resized in ecore_evas, check evas rotate state. Summary: when ecore_evas is resized, get evas' size, but angle not checked, so put a check. @fix Signed-off-by: Umesh Tanwar Reviewers: Hermet, devilhorns Reviewed By: devilhorns Subscribers: cedric, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6627 --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 15c275c8df..3ca5794084 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -460,7 +460,10 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h) } } - evas_output_size_get(ee->evas, , ); + if (ECORE_EVAS_PORTRAIT(ee)) + evas_output_size_get(ee->evas, , ); + else + evas_output_size_get(ee->evas, , ); if (ECORE_EVAS_PORTRAIT(ee) && ((ow != w) || (oh != h))) diff = 1; --
