ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c99b37ad47f022cfbaca5fde230572df2136e104
commit c99b37ad47f022cfbaca5fde230572df2136e104
Author: Amitesh Singh <amitesh...@samsung.com>
Date: Wed Jan 17 15:52:58 2018 +0900
Efl.Ui.Progressbar: implement range min max
---
po/POTFILES.in | 1 +
src/Makefile_Elementary.am | 1 +
src/bin/elementary/test.c | 2 +
src/bin/elementary/test_ui_progressbar.c | 171 ++++++++++++++++++++++++
src/lib/elementary/efl_ui_progressbar.c | 94 ++++++++++++-
src/lib/elementary/efl_ui_progressbar.eo | 1 +
src/lib/elementary/efl_ui_progressbar_part.eo | 1 +
src/lib/elementary/efl_ui_progressbar_private.h | 4 +
8 files changed, 269 insertions(+), 6 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 925b2952cf..425f35c5ad 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -49,6 +49,7 @@ src/bin/elementary/test_panes.c
src/bin/elementary/test_photo.c
src/bin/elementary/test_photocam.c
src/bin/elementary/test_progressbar.c
+src/bin/elementary/test_ui_progressbar.c
src/bin/elementary/test_radio.c
src/bin/elementary/test_scaling.c
src/bin/elementary/test_scroller.c
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index db53d2aba7..eee0170d3d 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -955,6 +955,7 @@ bin/elementary/test_photocam.c \
bin/elementary/test_popup.c \
bin/elementary/test_prefs.c \
bin/elementary/test_progressbar.c \
+bin/elementary/test_ui_progressbar.c \
bin/elementary/test_radio.c \
bin/elementary/test_scaling.c \
bin/elementary/test_scroller.c \
diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index 6c0d4ee1e0..8685e1bce5 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -170,6 +170,7 @@ void test_win_state2(void *data, Evas_Object *obj, void
*event_info);
void test_win_stack(void *data, Evas_Object *obj, void *event_info);
void test_progressbar(void *data, Evas_Object *obj, void *event_info);
void test_progressbar2(void *data, Evas_Object *obj, void *event_info);
+void test_ui_progressbar(void *data, Evas_Object *obj, void *event_info);
void test_fileselector(void *data, Evas_Object *obj, void *event_info);
void test_separator(void *data, Evas_Object *obj, void *event_info);
void test_scroller(void *data, Evas_Object *obj, void *event_info);
@@ -1045,6 +1046,7 @@ add_tests:
ADD_TEST(NULL, "Range Values", "Slider", test_slider);
ADD_TEST(NULL, "Range Values", "Progressbar", test_progressbar);
ADD_TEST(NULL, "Range Values", "Progressbar 2", test_progressbar2);
+ ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Progressbar",
test_ui_progressbar);
ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Nstate", test_nstate);
ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Slider_Interval",
test_slider_interval);
ADD_TEST_EO(NULL, "Range Values", "Efl.Ui.Slider", test_ui_slider);
diff --git a/src/bin/elementary/test_ui_progressbar.c
b/src/bin/elementary/test_ui_progressbar.c
new file mode 100644
index 0000000000..e1391421b1
--- /dev/null
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -0,0 +1,171 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#include <Elementary.h>
+
+typedef struct _pbdata
+{
+ Eo *win;
+ Eo *pb1;
+ Eo *pb2;
+ Eo *btn_start;
+ Eo *btn_stop;
+ Eo *btn_reset;
+ Ecore_Timer *timer;
+} pbdata;
+
+static Eina_Bool
+_set_progress_val(Eo *pb, double inc_value)
+{
+ double progress;
+
+ progress = efl_ui_range_value_get(pb);
+
+ if (progress < 100.0)
+ progress += inc_value;
+ else
+ return EINA_TRUE;
+
+ efl_ui_range_value_set(pb, progress);
+
+ return EINA_FALSE;
+}
+
+static Eina_Bool
+_pb_timer_cb(void *d)
+{
+ pbdata *pd = d;
+ double progress_val;
+
+ if (!pd) return ECORE_CALLBACK_CANCEL;
+
+ progress_val = efl_ui_range_value_get(pd->pb1);
+ if (progress_val < 100.0)
+ {
+ progress_val += 1;
+ efl_ui_range_value_set(pd->pb2, progress_val);
+ }
+
+ if (!_set_progress_val(pd->pb1, 0.5))
+ return ECORE_CALLBACK_RENEW;
+
+ pd->timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+}
+
+static void
+_start_btn_clicked_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+ pbdata *pd = d;
+
+ if (!pd) return;
+
+ printf("start button is clicked\n");
+
+ efl_ui_widget_disabled_set(pd->btn_start, EINA_TRUE);
+ efl_ui_widget_disabled_set(pd->btn_stop, EINA_FALSE);
+
+ if (!pd->timer) pd->timer = ecore_timer_add(0.1, _pb_timer_cb, pd);
+}
+
+static void
+_stop_btn_clicked_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+ pbdata *pd = d;
+
+ if (!pd) return;
+ printf("stop button is clicked\n");
+
+ efl_ui_widget_disabled_set(pd->btn_start, EINA_FALSE);
+ efl_ui_widget_disabled_set(pd->btn_stop, EINA_TRUE);
+
+ if (pd->timer)
+ {
+ ecore_timer_del(pd->timer);
+ pd->timer = NULL;
+ }
+}
+
+static void
+_reset_btn_clicked_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+ pbdata *pd = d;
+
+ if (!pd) return;
+ printf("reset button is clicked\n");
+
+ efl_ui_range_value_set(pd->pb1, 0.0);
+ efl_ui_range_value_set(pd->pb2, 0.0);
+}
+
+static void
+_win_delete_req_cb(void *d, const Efl_Event *ev EINA_UNUSED)
+{
+ pbdata *pd = d;
+
+ if (pd->timer) ecore_timer_del(pd->timer);
+ efl_del(pd->win);
+ free(pd);
+}
+
+void
+test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Eo *win, *bx, *btbx;
+ pbdata *pd;
+
+ pd = (pbdata *)calloc(1, sizeof(pbdata));
+
+ pd->win = win = efl_add(EFL_UI_WIN_CLASS, NULL,
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
+ efl_text_set(efl_added, "Efl.Ui.Progressbar"),
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE),
+ efl_event_callback_add(efl_added,
EFL_UI_WIN_EVENT_DELETE_REQUEST,
+ _win_delete_req_cb, pd)
+ );
+
+ bx = efl_add(EFL_UI_BOX_CLASS, win,
+ efl_content_set(win, efl_added)
+ );
+
+ pd->pb1 = efl_add(EFL_UI_PROGRESSBAR_CLASS, bx,
+ efl_pack(bx, efl_added),
+ efl_text_set(efl_added, "percent"),
+ efl_ui_range_min_max_set(efl_added, 0, 100),
+ efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20))
+ );
+
+ pd->pb2 = efl_add(EFL_UI_PROGRESSBAR_CLASS, bx,
+ efl_pack(bx, efl_added),
+ efl_text_set(efl_added, "10-100"),
+ efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE),
+ efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250,
20)),
+ efl_ui_range_min_max_set(efl_added, 10, 100),
+ efl_ui_range_value_set(efl_added, 10)
+ );
+
+ btbx = efl_add(EFL_UI_BOX_CLASS, bx,
+ efl_pack(bx, efl_added),
+ efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)
+ );
+
+ pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
+ efl_text_set(efl_added, "start"),
+ efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED,
+ _start_btn_clicked_cb, pd),
+ efl_pack(btbx, efl_added)
+ );
+
+ pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx,
+ efl_text_set(efl_added, "stop"),
+ efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED,
+ _stop_btn_clicked_cb, pd),
+ efl_pack(btbx, efl_added)
+ );
+ pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx,
+ efl_text_set(efl_added, "reset"),
+ efl_event_callback_add(efl_added,
EFL_UI_EVENT_CLICKED,
+ _reset_btn_clicked_cb, pd),
+ efl_pack(btbx, efl_added)
+ );
+}
diff --git a/src/lib/elementary/efl_ui_progressbar.c
b/src/lib/elementary/efl_ui_progressbar.c
index dc03e3dcf7..b8129fec4f 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -114,6 +114,8 @@ _units_set(Evas_Object *obj)
// Keeping this bug since the legacy code was like that.
if (sd->is_legacy_format_string && !sd->is_legacy_format_cb)
eina_value_set(&val, 100 * sd->val);
+ else
+ eina_value_set(&val, sd->val);
eina_strbuf_reset(sd->format_strbuf);
sd->format_cb(sd->format_cb_data, sd->format_strbuf, val);
@@ -140,7 +142,8 @@ _val_set(Evas_Object *obj)
EINA_LIST_FOREACH(sd->progress_status, l, ps)
{
- pos = ps->val;
+ pos = (ps->val - ps->val_min)/(ps->val_max - ps->val_min);
+
if ((!rtl && _is_inverted(sd->dir)) ||
(rtl && ((sd->dir == EFL_UI_DIR_UP) ||
(sd->dir == EFL_UI_DIR_RIGHT))))
@@ -361,7 +364,7 @@ _efl_ui_progressbar_efl_canvas_group_group_add(Eo *obj,
Efl_Ui_Progressbar_Data
priv->dir = EFL_UI_DIR_RIGHT;
priv->val = MIN_RATIO_LVL;
-
+ priv->val_max = 1.0;
group = _efl_ui_progressbar_theme_group_get(obj, priv);
if (!elm_widget_theme_object_set(obj, wd->resize_obj,
@@ -477,14 +480,49 @@ _progressbar_span_size_set(Eo *obj,
Efl_Ui_Progressbar_Data *sd, Evas_Coord size
}
static void
+_progress_part_min_max_set(Efl_Ui_Progressbar_Data *sd, const char *part_name,
double min, double max)
+{
+ Efl_Ui_Progress_Status *ps;
+ Eina_Bool existing_ps = EINA_FALSE;
+ Eina_List *l;
+
+ if (!strcmp(part_name, "elm.cur.progressbar"))
+ {
+ sd->val_min = min;
+ sd->val_max = max;
+ }
+
+ EINA_LIST_FOREACH(sd->progress_status, l, ps)
+ {
+ if (!strcmp(ps->part_name, part_name))
+ {
+ existing_ps = EINA_TRUE;
+ ps->val_min = min;
+ ps->val_max = max;
+ break;
+ }
+ }
+ if (!existing_ps)
+ {
+ ps = _progress_status_new(part_name, min);
+ ps->val_min = min;
+ ps->val_max = max;
+ sd->progress_status = eina_list_append(sd->progress_status, ps);
+ }
+}
+
+static void
_progressbar_part_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char
*part_name, double val)
{
Efl_Ui_Progress_Status *ps;
Eina_Bool existing_ps = EINA_FALSE;
Eina_List *l;
+ double min, max;
- if (val < MIN_RATIO_LVL) val = MIN_RATIO_LVL;
- if (val > MAX_RATIO_LVL) val = MAX_RATIO_LVL;
+ efl_ui_range_min_max_get(efl_part(obj, part_name), &min, &max);
+
+ if (val < min) val = min;
+ if (val > max) val = max;
if (!strcmp(part_name, "elm.cur.progressbar"))
sd->val = val;
@@ -501,6 +539,8 @@ _progressbar_part_value_set(Eo *obj,
Efl_Ui_Progressbar_Data *sd, const char *pa
if (!existing_ps)
{
ps = _progress_status_new(part_name, val);
+ ps->val_min = 0.0;
+ ps->val_max = 1.0;
sd->progress_status = eina_list_append(sd->progress_status, ps);
}
else
@@ -535,9 +575,9 @@ _efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj,
Efl_Ui_Progressbar_Dat
}
EOLIAN static double
-_efl_ui_progressbar_efl_ui_range_range_value_get(Eo *obj EINA_UNUSED,
Efl_Ui_Progressbar_Data *sd)
+_efl_ui_progressbar_efl_ui_range_range_value_get(Eo *obj,
Efl_Ui_Progressbar_Data *sd EINA_UNUSED)
{
- return sd->val;
+ return efl_ui_range_value_get(efl_part(obj, "elm.cur.progressbar"));
}
EOLIAN static void
@@ -583,6 +623,19 @@ _efl_ui_progressbar_pulse_get(Eo *obj EINA_UNUSED,
Efl_Ui_Progressbar_Data *sd)
return (sd->pulse_state && sd->pulse);
}
+EOLIAN static void
+_efl_ui_progressbar_efl_ui_range_range_min_max_set(Eo *obj EINA_UNUSED,
Efl_Ui_Progressbar_Data *sd, double min, double max)
+{
+ _progress_part_min_max_set(sd, "elm.cur.progressbar", min, max);
+}
+
+EOLIAN static void
+_efl_ui_progressbar_efl_ui_range_range_min_max_get(Eo *obj EINA_UNUSED,
Efl_Ui_Progressbar_Data *sd, double *min, double *max)
+{
+ if (min) *min = sd->val_min;
+ if (max) *max = sd->val_max;
+}
+
/* Efl.Part begin */
EOLIAN static Eo *
@@ -622,6 +675,35 @@ _efl_ui_progressbar_efl_access_value_value_and_text_get(Eo
*obj EINA_UNUSED, Efl
if (value) *value = _pd->val;
}
+EOLIAN static void
+_efl_ui_progressbar_part_efl_ui_range_range_min_max_set(Eo *obj, void *_pd
EINA_UNUSED, double min, double max)
+{
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj,
EFL_UI_PROGRESSBAR_CLASS);
+
+ _progress_part_min_max_set(sd, pd->part, min, max);
+}
+
+EOLIAN static void
+_efl_ui_progressbar_part_efl_ui_range_range_min_max_get(Eo *obj, void *_pd
EINA_UNUSED, double *min, double *max)
+{
+ Efl_Ui_Progress_Status *ps;
+ Eina_List *l;
+
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj,
EFL_UI_PROGRESSBAR_CLASS);
+
+ EINA_LIST_FOREACH(sd->progress_status, l, ps)
+ {
+ if (!strcmp(ps->part_name, pd->part))
+ {
+ if (min) *min = ps->val_min;
+ if (max) *max = ps->val_max;
+ break;
+ }
+ }
+}
+
#include "efl_ui_progressbar_part.eo.c"
/* Efl.Part end */
diff --git a/src/lib/elementary/efl_ui_progressbar.eo
b/src/lib/elementary/efl_ui_progressbar.eo
index fd1e890af4..c8c16f1d31 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -54,6 +54,7 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range,
Efl.Ui.Format,
Efl.Ui.Widget.widget_sub_object_add;
Efl.Ui.Widget.widget_sub_object_del;
Efl.Ui.Range.range_value { get; set; }
+ Efl.Ui.Range.range_min_max {get; set; }
Efl.Ui.Direction.direction { get; set; }
Efl.Ui.Format.format_cb { set; }
Efl.Part.part;
diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo
b/src/lib/elementary/efl_ui_progressbar_part.eo
index a57bfa7cdc..f1d2515c96 100644
--- a/src/lib/elementary/efl_ui_progressbar_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -4,5 +4,6 @@ class Efl.Ui.Progressbar.Part (Efl.Ui.Layout.Part, Efl.Ui.Range)
data: null;
implements {
Efl.Ui.Range.range_value { set; get; }
+ Efl.Ui.Range.range_min_max {get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_progressbar_private.h
b/src/lib/elementary/efl_ui_progressbar_private.h
index c9b0c9b11f..7bdf8a98a0 100644
--- a/src/lib/elementary/efl_ui_progressbar_private.h
+++ b/src/lib/elementary/efl_ui_progressbar_private.h
@@ -32,6 +32,9 @@ struct _Efl_Ui_Progressbar_Data
Evas_Coord size; /**< Width or height of progressbar */
double val; /**< Value of progressbar */
+
+ double val_min;
+ double val_max;
Eina_List *progress_status; /**< The list of
_Elm_Progress_Status. To save the progress value(in percentage) each part of
given progress bar */
@@ -52,6 +55,7 @@ struct _Efl_Ui_Progress_Status
{
const char *part_name;
double val;
+ double val_min, val_max;
};
/**
--
