bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progressbar: Swaped the layer of 'progress' and 'progress1'. 

- 'progress' is the main progress so it should be on top.
- 'progress' should move slower than 'progress1' in the example.
- Changed the name of multi progress image name from 'recording' to 'double'.
This commit is contained in:
Daniel Juyung Seo 2013-10-16 22:28:55 +09:00
parent ad434a0994
commit cdd5ab5ec9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
legacy/elementary/data/themes/images/bt_recording.png → legacy/elementary/data/themes/images/bt_double.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 495 B

10
legacy/elementary/data/themes/widgets/progressbar.edc
View File

@ -850,10 +850,11 @@ group { name: "elm/progressbar/horizontal/wheel";
group { name: "elm/progressbar/horizontal/double"; group { name: "elm/progressbar/horizontal/double";
inherit: "elm/progressbar/horizontal/default"; inherit: "elm/progressbar/horizontal/default";
images { images {
image: "bt_recording.png" COMP; image: "bt_double.png" COMP;
} }
parts { parts {
part { name: "elm.progress.progressbar1"; part { name: "elm.progress.progressbar1";
insert_after: "elm.text.status";
mouse_events: 0; mouse_events: 0;
clip_to: "elm.background.progressbar"; clip_to: "elm.background.progressbar";
description { description {
@ -870,7 +871,7 @@ group { name: "elm/progressbar/horizontal/double";
offset: -1 -1; offset: -1 -1;
} }
image { image {
normal: "bt_recording.png"; normal: "bt_double.png";
border: 6 6 6 6; border: 6 6 6 6;
} }
} }
@ -986,10 +987,11 @@ group { name: "elm/progressbar/horizontal/double";
group { name: "elm/progressbar/vertical/double"; group { name: "elm/progressbar/vertical/double";
inherit: "elm/progressbar/vertical/default"; inherit: "elm/progressbar/vertical/default";
images { images {
image: "bt_recording.png" COMP; image: "bt_double.png" COMP;
} }
parts { parts {
part { name: "elm.progress.progressbar1"; part { name: "elm.progress.progressbar1";
insert_after: "background";
mouse_events: 0; mouse_events: 0;
clip_to: "elm.background.progressbar"; clip_to: "elm.background.progressbar";
description { description {
@ -1006,7 +1008,7 @@ group { name: "elm/progressbar/vertical/double";
offset: -1 -1; offset: -1 -1;
} }
image { image {
normal: "bt_recording.png"; normal: "bt_double.png";
border: 6 6 6 6; border: 6 6 6 6;
} }
} }

12
legacy/elementary/src/bin/test_progressbar.c
View File

@ -271,15 +271,15 @@ _progressbar2_timer_cb(void *data)
{ {
progress += 0.0123; progress += 0.0123;
elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress); elm_progressbar_part_value_set(pd->pb1, "elm.cur.progressbar", progress);
elm_progressbar_value_set(pd->pb2, progress); elm_progressbar_part_value_set(pd->pb2, "elm.cur.progressbar1", progress);
elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar", progress); elm_progressbar_part_value_set(pd->pb3, "elm.cur.progressbar1", progress);
elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar", progress); elm_progressbar_part_value_set(pd->pb4, "elm.cur.progressbar1", progress);
} }
_set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar1"); _set_progress_val(pd->pb2, 0.00723, "elm.cur.progressbar");
_set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar1"); _set_progress_val(pd->pb3, 0.00523, "elm.cur.progressbar");
if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar1")) if (!_set_progress_val(pd->pb4, 0.00423, "elm.cur.progressbar"))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
pd->timer = NULL; pd->timer = NULL;