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

Manual revert of: commit 07404215a9 

combobox: add Multiple selection feature

This exposes problems with name clashes and behaviour change for the legacy API.
Revert for now and we can revisit for 1.19.

Git revert got to confused as this was committed before we merged elm in. I did
the revert manually.
This commit is contained in:
Stefan Schmidt 2016-08-11 11:27:25 +02:00
parent 27fc8a0467
commit 961a1ada0f
8 changed files with 8 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Makefile.am
View File

@ -215,7 +215,6 @@ elementary/objects/test.edj \
elementary/objects/test_external.edj \
elementary/objects/multip.edj \
elementary/objects/cursors.edj \
elementary/objects/combobox_multiple.edj \
elementary/objects/font_preview.edj \
elementary/objects/postit_ent.edj \
elementary/objects/multibuttonentry.edj \
@ -246,11 +245,6 @@ elementary/objects/cursors.edj: elementary/objects/cursors.edc
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/combobox_multiple.edj: elementary/objects/combobox_multiple.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \
$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
$(AM_V_EDJ) \
$(MKDIR_P) elementary/objects/; \

1
data/elementary/objects/Makefile.am
View File

@ -7,7 +7,6 @@ elementary/objects/test_prefs.edc \
elementary/objects/test_prefs.epc \
elementary/objects/multip.edc \
elementary/objects/cursors.edc \
elementary/objects/combobox_multiple.edc \
elementary/objects/font_preview.edc \
elementary/objects/postit_ent.edc \
elementary/objects/multibuttonentry.edc \

61
data/elementary/objects/combobox_multiple.edc
View File

@ -1,61 +0,0 @@
collections {
group {
name: "combobox_multiple_test";
parts{
part {
name: "bg";
type: RECT;
mouse_events: 1;
scale:1;
description {
state: "default" 0.0;
color: 0 0 0 0;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
}
}
part{
name: "top.left";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
min : 0 0;
fixed: 1 1;
rel1 { relative: 0.0 0.0; to: bg; }
rel2 { relative: 0.0 0.0; to: bg; }
align: 0.0 0.0;
color: 0 0 0 0;
}
}
part{
name: "bottom.right";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
min : 0 0;
fixed: 1 1;
rel1 { relative: 1.0 1.0; to: bg; }
rel2 { relative: 1.0 1.0; to: bg; }
align: 1.0 1.0;
color: 0 0 0 0;
}
}
part {
name: "combobox";
type: SWALLOW;
mouse_events: 1;
scale:1;
description {
state: "default" 0.0;
min : 0 0;
max : -1 300;
rel1 { relative: 0.0 1.0; to: top.left; }
rel2 { relative: 0.0 0.0; to: bottom.right; }
align: 0.0 0.0;
}
}
}
}
}

2
src/bin/elementary/test.c
View File

@ -48,7 +48,6 @@ void test_clock_edit(void *data, Evas_Object *obj, void *event_info);
void test_clock_edit2(void *data, Evas_Object *obj, void *event_info);
void test_clock_pause(void *data, Evas_Object *obj, void *event_info);
void test_combobox(void *data, Evas_Object *obj, void *event_info);
void test_combobox2(void *data, Evas_Object *obj, void *event_info);
void test_check(void *data, Evas_Object *obj, void *event_info);
void test_check_toggle(void *data, Evas_Object *obj, void *event_info);
void test_nstate(void *data, Evas_Object *obj, void *event_info);
@ -845,7 +844,6 @@ add_tests:
ADD_TEST(NULL, "Selectors", "DaySelector", test_dayselector);
ADD_TEST(NULL, "Selectors", "Main menu", test_main_menu);
ADD_TEST(NULL, "Selectors", "Combobox", test_combobox);
ADD_TEST(NULL, "Selectors", "Combobox Multiple Selection", test_combobox2);
//------------------------------//
ADD_TEST(NULL, "Cursors", "Cursor", test_cursor);

102
src/bin/elementary/test_combobox.c
View File

File diff suppressed because one or more lines are too long

115
src/lib/elementary/elc_combobox.c
View File

@ -152,8 +152,7 @@ _table_resize(void *data)
evas_object_geometry_get(elm_object_item_track(sd->item), NULL, NULL,
NULL, &h);
if (h) sd->item_height = h;
evas_object_geometry_get(elm_object_part_content_get(data, "elm.swallow.content"),
NULL, NULL, &obj_w, NULL);
evas_object_geometry_get(sd->entry, NULL, NULL, &obj_w, NULL);
evas_object_geometry_get(data, NULL, &obj_y, NULL, &obj_h);
evas_object_geometry_get(sd->hover_parent, NULL, NULL, &hover_parent_w,
&hover_parent_h);
@ -202,13 +201,8 @@ static void
_on_item_selected(void *data , Evas_Object *obj EINA_UNUSED, void *event)
{
ELM_COMBOBOX_DATA_GET(data, sd);
elm_object_focus_set(sd->entry, EINA_TRUE);
if (!sd->multiple_selection) elm_object_focus_set(sd->entry, EINA_TRUE);
else
{
elm_genlist_item_bring_in(sd->item, ELM_GENLIST_ITEM_SCROLLTO_TOP);
elm_object_focus_set(sd->mbe, EINA_TRUE);
}
eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_SELECTED, event);
}
@ -311,98 +305,6 @@ _elm_combobox_elm_button_admits_autorepeat_get(Eo *obj EINA_UNUSED,
return EINA_FALSE;
}
EOLIAN static Eina_Bool
_elm_combobox_multiple_selection_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd)
{
return pd->multiple_selection;
}
static void
_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
{
//Unset the multibuttonentry to contracted mode of single line
elm_multibuttonentry_expanded_set(event->object, EINA_TRUE);
}
static void
_mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
{
}
static void
_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event)
{
//Set the multibuttonentry to contracted mode of single line
elm_multibuttonentry_expanded_set(event->object, EINA_FALSE);
}
static void
_mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED)
{
ELM_COMBOBOX_DATA_GET(data, sd);
elm_genlist_filter_set(sd->genlist, NULL);
}
EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks,
{ EFL_UI_EVENT_CLICKED, _mbe_clicked_cb },
{ ELM_WIDGET_EVENT_FOCUSED, _mbe_focused_cb },
{ ELM_WIDGET_EVENT_UNFOCUSED, _mbe_unfocused_cb },
{ ELM_MULTIBUTTONENTRY_EVENT_ITEM_ADDED , _mbe_item_added });
EO_CALLBACKS_ARRAY_DEFINE(entry_callbacks,
{ ELM_ENTRY_EVENT_CHANGED_USER, _on_changed },
{ ELM_ENTRY_EVENT_ABORTED, _on_aborted });
EOLIAN static void
_elm_combobox_multiple_selection_set(Eo *obj, Elm_Combobox_Data *pd,
Eina_Bool enabled)
{
Evas_Object* scr;
pd->multiple_selection = enabled;
if (enabled)
{
// This is multibuttonentry object that will take over the MBE call
pd->mbe = eo_add(ELM_MULTIBUTTONENTRY_CLASS, obj);
evas_object_size_hint_weight_set(pd->mbe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(pd->mbe, EVAS_HINT_FILL, EVAS_HINT_FILL);
eo_event_callback_array_add(elm_multibuttonentry_entry_get(pd->mbe), entry_callbacks(), obj);
eo_event_callback_array_add(pd->mbe, mbe_callbacks(), obj);
pd->entry = elm_object_part_content_unset(obj, "elm.swallow.content");
elm_object_text_set(pd->mbe, elm_object_part_text_get(pd->entry, NULL));
elm_object_part_text_set(pd->mbe, "guide", elm_object_part_text_get(pd->entry,
"guide"));
evas_object_hide(pd->entry);
scr = elm_scroller_add(obj);
elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE);
elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
evas_object_size_hint_weight_set(scr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(scr, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(scr);
elm_object_content_set(scr, pd->mbe);
elm_object_part_content_set(obj, "elm.swallow.content", scr);
elm_widget_can_focus_set(pd->genlist, EINA_FALSE);
eo_composite_attach(obj, pd->mbe);
}
else
{
scr = elm_object_part_content_unset(obj, "elm.swallow.content");
elm_object_part_content_set(obj, "elm.swallow.content", pd->entry);
elm_object_text_set(pd->entry, elm_object_part_text_get(pd->mbe, NULL));
elm_object_part_text_set(pd->entry, "guide",
elm_object_part_text_get(pd->mbe, "guide"));
elm_widget_can_focus_set(pd->genlist, EINA_TRUE);
elm_genlist_item_bring_in(pd->item, ELM_GENLIST_ITEM_SCROLLTO_NONE);
evas_object_hide(scr);
eo_composite_attach(obj, pd->entry);
}
}
EAPI Evas_Object *
elm_combobox_add(Evas_Object *parent)
{
@ -433,6 +335,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent);
elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
elm_hover_target_set(sd->hover, obj);
elm_widget_sub_object_add(obj, sd->hover);
snprintf(buf, sizeof(buf), "combobox_vertical/%s",
elm_widget_style_get(obj));
elm_object_style_set(sd->hover, buf);
@ -477,7 +380,8 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
ELM_SCROLLER_POLICY_OFF);
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_single_line_set(entry, EINA_TRUE);
eo_event_callback_array_add(entry, entry_callbacks(), obj);
eo_event_callback_add(entry, ELM_ENTRY_EVENT_CHANGED_USER, _on_changed, obj);
eo_event_callback_add(entry, ELM_ENTRY_EVENT_ABORTED, _on_aborted, obj);
evas_object_show(entry);
elm_object_part_content_set(obj, "elm.swallow.content", entry);
@ -493,10 +397,7 @@ EOLIAN static void
_elm_combobox_hover_begin(Eo *obj, Elm_Combobox_Data *sd)
{
if (!sd->hover) return;
if (sd->multiple_selection)
elm_object_focus_set(sd->mbe, EINA_TRUE);
else elm_object_focus_set(sd->entry, EINA_TRUE);
elm_object_focus_set(sd->entry, EINA_TRUE);
_activate(obj);
}
@ -614,15 +515,13 @@ EOLIAN void
_elm_combobox_elm_widget_part_text_set(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd,
const char * part, const char *label)
{
if (pd->multiple_selection) elm_object_part_text_set(pd->mbe, part, label);
else elm_object_part_text_set(pd->entry, part, label);
elm_object_part_text_set(pd->entry, part, label);
}
EOLIAN const char *
_elm_combobox_elm_widget_part_text_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd,
const char * part)
{
if (pd->multiple_selection) return elm_object_part_text_get(pd->mbe, part);
return elm_object_part_text_get(pd->entry, part);
}

21
src/lib/elementary/elm_combobox.eo
View File

@ -1,6 +1,6 @@
class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
Elm.Interface.Atspi_Widget_Action,
Elm.Entry, Elm.Genlist, Elm.Hover, Elm.Multibuttonentry)
Elm.Entry, Elm.Genlist, Elm.Hover)
{
legacy_prefix: elm_combobox;
eo_prefix: elm_obj_combobox;
@ -18,25 +18,6 @@ class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
return: bool;
}
}
@property multiple_selection {
get {
[[Returns whether the combobox allows multiple selection.
@since 1.18
]]
}
set {
[[Enables or disables multiple selection in combobox.
Warning: This API should be set before any other API on
combobox, if you wish to avoid complications.
@since 1.18
]]
}
values {
enabled: bool; [[$true if multiple selection is enabled,
$false otherwise.]]
}
}
hover_begin {
[[This triggers the combobox popup from code, the same as if the user
had clicked the button.

2
src/lib/elementary/elm_widget_combobox.h
View File

@ -33,7 +33,6 @@ struct _Elm_Combobox_Data
Evas_Object *entry;
Evas_Object *tbl;
Evas_Object *spacer;
Evas_Object *mbe;
Elm_Object_Item *item;
const char *style;
const char *best_location;
@ -41,7 +40,6 @@ struct _Elm_Combobox_Data
int item_height;
Eina_Bool expanded:1;
Eina_Bool first_filter:1;
Eina_Bool multiple_selection:1;
};
/**