summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmesh Tanwar <umesh.tanwar@samsung.com>2015-08-07 16:51:41 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-08-07 16:51:42 +0900
commit6e5c7506c73cc00018eb44096c2c5634b690b165 (patch)
tree4a69175f106a88ac4384bc486fadeaea2f17e828
parente43e2cc79505c846e2dfa785c87d3b32c0e5692e (diff)
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.tanwar@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
-rw-r--r--data/themes/edc/elm/scroller.edc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index f1a57f665..cf1cb99c1 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";
44 get_geometry(PART:"y_vbar_up", x,y,w, h); 44 get_geometry(PART:"y_vbar_up", x,y,w, h);
45 get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1); 45 get_geometry(PART:"y_vbar_up_mapper", x1,y1,w1, h1);
46 46
47 if(y == y1) 47 if((y1 <= y) && (y <= (y1 + h1)))
48 { 48 {
49 set_state(PART:"arrow1_vbar", "hidden", 0.0); 49 set_state(PART:"arrow1_vbar", "hidden", 0.0);
50 set_state(PART:"sb_vbar_a1", "hidden", 0.0); 50 set_state(PART:"sb_vbar_a1", "hidden", 0.0);
@@ -58,7 +58,7 @@ group { name: "elm/scroller/base/default";
58 get_geometry(PART:"y_vbar_down", x,y,w, h); 58 get_geometry(PART:"y_vbar_down", x,y,w, h);
59 get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1); 59 get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1);
60 60
61 if((y+h) == (y1+h1)) 61 if((y1 <= (y + h)) && ((y+ h) <= (y1 + h1)))
62 { 62 {
63 set_state(PART:"arrow2_vbar", "hidden", 0.0); 63 set_state(PART:"arrow2_vbar", "hidden", 0.0);
64 set_state(PART:"sb_vbar_a2", "hidden", 0.0); 64 set_state(PART:"sb_vbar_a2", "hidden", 0.0);
@@ -79,7 +79,7 @@ group { name: "elm/scroller/base/default";
79 get_geometry(PART:"x_hbar_left", x,y,w, h); 79 get_geometry(PART:"x_hbar_left", x,y,w, h);
80 get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1); 80 get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1);
81 81
82 if(x == x1) 82 if((x1 <= x) && (x <= (x1 + w1)))
83 { 83 {
84 set_state(PART:"arrow1_hbar", "hidden", 0.0); 84 set_state(PART:"arrow1_hbar", "hidden", 0.0);
85 set_state(PART:"sb_hbar_a1", "hidden", 0.0); 85 set_state(PART:"sb_hbar_a1", "hidden", 0.0);
@@ -93,7 +93,7 @@ group { name: "elm/scroller/base/default";
93 get_geometry(PART:"x_hbar_right", x,y,w, h); 93 get_geometry(PART:"x_hbar_right", x,y,w, h);
94 get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1); 94 get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1);
95 95
96 if((x+w) == (x1+w1)) 96 if((x1 <= (x + w)) && ((x + w) <= (x1 + w1)))
97 { 97 {
98 set_state(PART:"arrow2_hbar", "hidden", 0.0); 98 set_state(PART:"arrow2_hbar", "hidden", 0.0);
99 set_state(PART:"sb_hbar_a2", "hidden", 0.0); 99 set_state(PART:"sb_hbar_a2", "hidden", 0.0);