projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e608916
)
[elm_index]Fixed gumi verification:empty popup is shown when item doesn't exist
author
Goun Lee
<gouni.lee@samsung.com>
Thu, 22 Sep 2011 09:55:10 +0000
(18:55 +0900)
committer
Goun Lee
<gouni.lee@samsung.com>
Thu, 22 Sep 2011 09:55:10 +0000
(18:55 +0900)
src/lib/elm_index.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_index.c
b/src/lib/elm_index.c
index
fcf9f1b
..
4257322
100644
(file)
--- a/
src/lib/elm_index.c
+++ b/
src/lib/elm_index.c
@@
-523,18
+523,38
@@
_sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
if(view_level == 0)
{
if(view_level == 0)
{
- if (wd->popup_str[1]) wd->popup_str[1][0] = '\0';
- wd->popup_str[0] = (char *)realloc(wd->popup_str[0], (sizeof(char) * strlen(last) + 1));
+ if(wd->tot_items_count[0])
+ {
+ if (wd->popup_str[1]) wd->popup_str[1][0] = '\0';
+ wd->popup_str[0] = (char *)realloc(wd->popup_str[0], (sizeof(char) * strlen(last) + 1));
- strcpy(wd->popup_str[0], last);
- edje_object_signal_emit(wd->base, "hide_2nd_level", "");
+ strcpy(wd->popup_str[0], last);
+ edje_object_signal_emit(wd->base, "hide_2nd_level", "");
+ }
+ else
+ {
+ edje_object_signal_emit(wd->base, "button.image.hidden", "");
+ if(label)free(label);
+ if(last) free(last);
+ return;
+ }
}
if (view_level == 1 && wd->level_active[1])
{
}
if (view_level == 1 && wd->level_active[1])
{
- wd->popup_str[1] = (char *)realloc(wd->popup_str[1], (sizeof(char) * strlen(last) + 1));
+ if(wd->tot_items_count[1])
+ {
+ wd->popup_str[1] = (char *)realloc(wd->popup_str[1], (sizeof(char) * strlen(last) + 1));
- strcpy(wd->popup_str[1], last);
- edje_object_signal_emit(wd->base, "hide_first_level", "");
+ strcpy(wd->popup_str[1], last);
+ edje_object_signal_emit(wd->base, "hide_first_level", "");
+ }
+ else
+ {
+ edje_object_signal_emit(wd->base, "button.image.hidden", "");
+ if(label)free(label);
+ if(last) free(last);
+ return;
+ }
}
popup_text = (char *)malloc(sizeof(char) * (strlen(wd->popup_str[0]) + strlen(wd->popup_str[1]) + 1));
sprintf(popup_text, "%s%s", wd->popup_str[0], wd->popup_str[1]);
}
popup_text = (char *)malloc(sizeof(char) * (strlen(wd->popup_str[0]) + strlen(wd->popup_str[1]) + 1));
sprintf(popup_text, "%s%s", wd->popup_str[0], wd->popup_str[1]);
@@
-946,7
+966,10
@@
elm_index_active_set(Evas_Object *obj, Eina_Bool active)
_index_box_clear(obj, wd->bx[1], 1);
_index_process(obj);
_index_box_auto_fill(obj, wd->bx[0], 0);
_index_box_clear(obj, wd->bx[1], 1);
_index_process(obj);
_index_box_auto_fill(obj, wd->bx[0], 0);
- edje_object_signal_emit(wd->base, "elm,state,active", "elm");
+ if(wd->tot_items_count[wd->level])
+ edje_object_signal_emit(wd->base, "elm,state,active", "elm");
+ else
+ edje_object_signal_emit(wd->base, "button.image.hidden", "");
}
else
edje_object_signal_emit(wd->base, "elm,state,inactive", "elm");
}
else
edje_object_signal_emit(wd->base, "elm,state,inactive", "elm");