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

elementary: Formatting tweaks 

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>

SVN revision: 65556
This commit is contained in:
Mike McCormack 2011-11-24 04:02:09 +00:00 committed by Mike McCormack
parent f7f32ff7c0
commit 0a6442fc26
1 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/elementary/src/lib/elc_multibuttonentry.c
View File

@ -1,13 +1,6 @@
#include <Elementary.h>
#include "elm_priv.h"
/**
* @defgroup Multibuttonentry Multibuttonentry
* @ingroup Elementary
*
* This is a Multibuttonentry.
*/
#define MAX_STR 256
#define MIN_W_ENTRY 10
@ -27,7 +20,8 @@ typedef enum _Multibuttonentry_Button_State
MULTIBUTTONENTRY_BUTTON_STATE_NUM
} Multibuttonentry_Button_State;
typedef enum _MultiButtonEntry_Closed_Button_Type {
typedef enum _MultiButtonEntry_Closed_Button_Type
{
MULTIBUTTONENTRY_CLOSED_IMAGE,
MULTIBUTTONENTRY_CLOSED_LABEL
} MultiButtonEntry_Closed_Button_Type;
@ -40,7 +34,8 @@ typedef enum _Multibuttonentry_View_State
MULTIBUTTONENTRY_VIEW_SHRINK
} Multibuttonentry_View_State;
struct _Multibuttonentry_Item {
struct _Multibuttonentry_Item
{
Evas_Object *multibuttonentry;
Evas_Object *button;
void *data;
@ -55,7 +50,8 @@ typedef struct _Elm_Multibuttonentry_Item_Filter
} Elm_Multibuttonentry_Item_Filter;
typedef struct _Widget_Data Widget_Data;
struct _Widget_Data {
struct _Widget_Data
{
Evas_Object *base;
Evas_Object *box;
Evas_Object *entry;
@ -99,7 +95,8 @@ static void _button_clicked(void *data, Evas_Object *obj, const char *emission,
static void _del_button_obj(Evas_Object *obj, Evas_Object *btn);
static void _del_button_item(Elm_Multibuttonentry_Item *item);
static void _select_button(Evas_Object *obj, Evas_Object *btn);
static Elm_Multibuttonentry_Item* _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, const Elm_Multibuttonentry_Item *reference, void *data);
static Elm_Multibuttonentry_Item *_add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos,
const Elm_Multibuttonentry_Item *reference, void *data);
static void _add_button(Evas_Object *obj, char *str);
static void _evas_mbe_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _entry_changed_cb(void *data, Evas_Object *obj, void *event_info);
@ -775,7 +772,8 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
EINA_LIST_FOREACH(wd->filter_list, l, item_filter)
{
if ( !(item_filter->callback_func(obj, str, data, item_filter->data))) return NULL;
if (!(item_filter->callback_func(obj, str, data, item_filter->data)))
return NULL;
}
//entry is cleared when text is made to button
elm_entry_entry_set(wd->entry, "");
@ -950,7 +948,9 @@ _evas_mbe_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
if (wd->last_btn_select)
{
if ((wd->current) && ( (strcmp (ev->keyname, "BackSpace") == 0) || (strcmp (ev->keyname, "BackSpace (") == 0)))
if (wd->current &&
((strcmp (ev->keyname, "BackSpace") == 0) ||
(strcmp (ev->keyname, "BackSpace (") == 0)))
{
item = eina_list_data_get(wd->current);
if (item)
@ -959,8 +959,9 @@ _evas_mbe_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
elm_object_focus_set(wd->entry, EINA_TRUE);
}
}
else if ((((!wd->current) && (wd->n_str == 0) && (strcmp (ev->keyname, "BackSpace") == 0))
|| (strcmp (ev->keyname, "BackSpace (") == 0)))
else if (((!wd->current && (wd->n_str == 0) &&
(strcmp (ev->keyname, "BackSpace") == 0)) ||
(strcmp (ev->keyname, "BackSpace (") == 0)))
{
item = eina_list_data_get(eina_list_last(wd->items));
if (item)