enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

hoversel working. 

SVN revision: 38161
This commit is contained in:
Carsten Haitzler 2008-12-16 00:15:34 +00:00
parent 8ccbb7a6cb
commit 70f4e87999
3 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/elementary/data/themes/default.edc
View File

@ -419,6 +419,7 @@ collections {
tag: "br" "\n"; tag: "br" "\n";
tag: "hilight" "+ font=Sans:style=Bold"; tag: "hilight" "+ font=Sans:style=Bold";
tag: "b" "+ font=Sans:style=Bold"; tag: "b" "+ font=Sans:style=Bold";
tag: "tab" "\t";
} }
} }
parts { parts {
@ -2757,7 +2758,7 @@ collections {
} }
programs { programs {
program { name: "end"; program { name: "end";
signal: "mouse,down,1"; signal: "mouse,up,1";
source: "base"; source: "base";
action: SIGNAL_EMIT "elm,action,dismiss" ""; action: SIGNAL_EMIT "elm,action,dismiss" "";
} }
@ -3079,7 +3080,7 @@ collections {
} }
programs { programs {
program { name: "end"; program { name: "end";
signal: "mouse,down,1"; signal: "mouse,up,1";
source: "base"; source: "base";
action: SIGNAL_EMIT "elm,action,dismiss" ""; action: SIGNAL_EMIT "elm,action,dismiss" "";
} }
@ -3362,7 +3363,7 @@ collections {
} }
programs { programs {
program { name: "end"; program { name: "end";
signal: "mouse,down,1"; signal: "mouse,up,1";
source: "base"; source: "base";
action: SIGNAL_EMIT "elm,action,dismiss" ""; action: SIGNAL_EMIT "elm,action,dismiss" "";
} }

15
legacy/elementary/src/lib/Elementary.h
View File

@ -312,6 +312,21 @@ extern "C" {
* "clicked" - the user clicked the icon * "clicked" - the user clicked the icon
*/ */
typedef enum _Elm_Icon_Type
{
ELM_ICON_NONE,
ELM_ICON_FILE,
ELM_ICON_STANDARD
} Elm_Icon_Type;
typedef struct _Elm_Hoversel_Item Elm_Hoversel_Item;
EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
EAPI void elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI void elm_hoversel_label_set(Evas_Object *obj, const char *label);
EAPI void elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon);
EAPI void elm_hoversel_hover_end(Evas_Object *obj);
EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI void elm_hoversel_item_del(Elm_Hoversel_Item *item);
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
/// FIXME: TODO LIST /////////////////////////////////////////////////////// /// FIXME: TODO LIST ///////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

79
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -2,12 +2,23 @@
#include "elm_priv.h" #include "elm_priv.h"
typedef struct _Widget_Data Widget_Data; typedef struct _Widget_Data Widget_Data;
typedef struct _Item Item;
struct _Widget_Data struct _Widget_Data
{ {
Evas_Object *btn, *hover; Evas_Object *btn, *hover;
Evas_Object *hover_parent; Evas_Object *hover_parent;
const char *hover_style; Evas_List *items;
};
struct _Item
{
Evas_Object *obj;
const char *label;
const char *icon_file;
Elm_Icon_Type icon_type;
void (*func) (void *data, Evas_Object *obj, void *event_info);
const void *data;
}; };
static void _del_pre_hook(Evas_Object *obj); static void _del_pre_hook(Evas_Object *obj);
@ -27,7 +38,7 @@ static void
_del_hook(Evas_Object *obj) _del_hook(Evas_Object *obj)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
if (wd->hover_style) eina_stringshare_del(wd->hover_style); elm_hoversel_hover_end(obj);
free(wd); free(wd);
} }
@ -55,11 +66,21 @@ _hover_clicked(void *data, Evas_Object *obj, void *event_info)
elm_hoversel_hover_end(data); elm_hoversel_hover_end(data);
} }
static void
_item_clicked(void *data, Evas_Object *obj, void *event_info)
{
Item *it = data;
Evas_Object *obj2 = it->obj;
if (it->func) it->func(it->data, obj2, NULL);
elm_hoversel_hover_end(obj2);
}
static void static void
_button_clicked(void *data, Evas_Object *obj, void *event_info) _button_clicked(void *data, Evas_Object *obj, void *event_info)
{ {
Widget_Data *wd = elm_widget_data_get(data); Widget_Data *wd = elm_widget_data_get(data);
Evas_Object *bt, *bx, *ic; Evas_Object *bt, *bx, *ic;
Eina_List *l;
wd->hover = elm_hover_add(data); wd->hover = elm_hover_add(data);
elm_hover_style_set(wd->hover, "hoversel_vertical"); elm_hover_style_set(wd->hover, "hoversel_vertical");
evas_object_smart_callback_add(wd->hover, "clicked", _hover_clicked, data); evas_object_smart_callback_add(wd->hover, "clicked", _hover_clicked, data);
@ -69,15 +90,20 @@ _button_clicked(void *data, Evas_Object *obj, void *event_info)
bx = elm_box_add(wd->hover); bx = elm_box_add(wd->hover);
elm_box_homogenous_set(bx, 1); elm_box_homogenous_set(bx, 1);
bt = elm_button_add(wd->hover); for (l = wd->items; l; l = l->next)
elm_button_style_set(bt, "hoversel_vertical_entry"); {
elm_button_label_set(bt, "Forward"); Item *it = l->data;
evas_object_size_hint_weight_set(bt, 1.0, 0.0); bt = elm_button_add(wd->hover);
evas_object_size_hint_align_set(bt, -1.0, -1.0); elm_button_style_set(bt, "hoversel_vertical_entry");
elm_box_pack_end(bx, bt); elm_button_label_set(bt, it->label);
evas_object_show(bt); // FIXME: add icon
// elm_button_icon_set(bt, it->icon_file);
// FIXME: fill. evas_object_size_hint_weight_set(bt, 1.0, 0.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
elm_box_pack_end(bx, bt);
evas_object_smart_callback_add(bt, "clicked", _item_clicked, it);
evas_object_show(bt);
}
elm_hover_content_set elm_hover_content_set
(wd->hover, (wd->hover,
@ -152,21 +178,30 @@ elm_hoversel_hover_end(Evas_Object *obj)
wd->hover = NULL; wd->hover = NULL;
} }
EAPI void * // FIXME: return some sort of handle other than void * EAPI Elm_Hoversel_Item *
elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, int icon_type, void (*func) (void *data, Evas_Object *obj, void *event_into), const void *data) elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
{ {
Widget_Data *wd = elm_widget_data_get(obj); Widget_Data *wd = elm_widget_data_get(obj);
// FIXME: implement Item *it = calloc(1, sizeof(Item));
if (!it) return NULL;
wd->items = eina_list_append(wd->items, it);
it->obj = obj;
it->label = eina_stringshare_add(label);
it->icon_file = eina_stringshare_add(icon_file);
it->icon_type = icon_type;
it->func = func;
it->data = data;
return (Elm_Hoversel_Item *)it;
} }
EAPI void EAPI void
elm_hoversel_item_del(void *item) elm_hoversel_item_del(Elm_Hoversel_Item *item)
{ {
// FIXME: implement Item *it = (Item *)item;
} Widget_Data *wd = elm_widget_data_get(it->obj);
wd->items = eina_list_remove(wd->items, it);
EAPI void eina_stringshare_del(it->label);
elm_hoversel_item_enabled_set(void *item, Evas_Bool enabled) eina_stringshare_del(it->icon_file);
{ free(it);
// FIXME: implement // FIXME: if hover up - this will be bad and break
} }