Revert back to old panel code for now. This will get fixed someday, time
permitting. SVN revision: 43712
This commit is contained in:
Christopher Michael
parent
0df0cad61d
commit
8f270a63e8
|
|
@ -19355,9 +19355,9 @@ group
|
|||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
color: 255 0 0 100;
|
||||
color: 255 255 255 0;
|
||||
rel1.relative: 0.0 0.0;
|
||||
rel2.relative: 2.0 1.0;
|
||||
rel2.relative: 1.0 1.0;
|
||||
}
|
||||
description
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@ test_notify(void *data, Evas_Object *obj, void *event_info)
|
|||
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(tb);
|
||||
|
||||
|
||||
|
||||
notify = elm_notify_add(win);
|
||||
evas_object_size_hint_weight_set(notify, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,19 @@
|
|||
#include <Elementary.h>
|
||||
#ifndef ELM_LIB_QUICKLAUNCH
|
||||
|
||||
Elm_Genlist_Item_Class itc;
|
||||
|
||||
static char *_label_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static Evas_Object *_icon_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static Eina_Bool _state_get(const void *data, Evas_Object *obj, const char *source);
|
||||
static void _item_del(const void *data, Evas_Object *obj);
|
||||
static void _fill_list(Evas_Object *obj);
|
||||
static Eina_Bool _dir_has_subs(const char *path);
|
||||
|
||||
void
|
||||
test_panel(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Object *win, *bg, *panel;
|
||||
Evas_Object *win, *bg, *panel, *bx;
|
||||
Evas_Object *list;
|
||||
|
||||
win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
|
||||
|
|
@ -15,23 +24,141 @@ test_panel(void *data, Evas_Object *obj, void *event_info)
|
|||
elm_win_resize_object_add(win, bg);
|
||||
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bg);
|
||||
/*
|
||||
|
||||
bx = elm_box_add(win);
|
||||
elm_win_resize_object_add(win, bx);
|
||||
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bx);
|
||||
|
||||
panel = elm_panel_add(win);
|
||||
elm_panel_orient_set(panel, ELM_PANEL_ORIENT_LEFT);
|
||||
evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(panel, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(panel);
|
||||
*/
|
||||
evas_object_size_hint_weight_set(panel, 0.0, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(panel, 0.0, EVAS_HINT_FILL);
|
||||
|
||||
itc.item_style = "default";
|
||||
itc.func.label_get = _label_get;
|
||||
itc.func.icon_get = _icon_get;
|
||||
itc.func.state_get = _state_get;
|
||||
itc.func.del = _item_del;
|
||||
|
||||
list = elm_genlist_add(win);
|
||||
evas_object_resize(list, 100, 100);
|
||||
evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(list);
|
||||
/*
|
||||
|
||||
elm_panel_content_set(panel, list);
|
||||
*/
|
||||
|
||||
elm_box_pack_end(bx, panel);
|
||||
evas_object_show(panel);
|
||||
|
||||
_fill_list(list);
|
||||
|
||||
evas_object_resize(win, 300, 300);
|
||||
evas_object_show(win);
|
||||
}
|
||||
|
||||
static char *
|
||||
_label_get(const void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
return strdup(ecore_file_file_get(data));
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_icon_get(const void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
if (!strcmp(source, "elm.swallow.icon"))
|
||||
{
|
||||
Evas_Object *ic;
|
||||
|
||||
ic = elm_icon_add(obj);
|
||||
if (ecore_file_is_dir((char *)data))
|
||||
elm_icon_standard_set(ic, "folder");
|
||||
else
|
||||
elm_icon_standard_set(ic, "file");
|
||||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
evas_object_show(ic);
|
||||
return ic;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_state_get(const void *data, Evas_Object *obj, const char *source)
|
||||
{
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
_item_del(const void *data, Evas_Object *obj)
|
||||
{
|
||||
eina_stringshare_del(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_list(Evas_Object *obj)
|
||||
{
|
||||
DIR *d;
|
||||
struct dirent *de;
|
||||
char buff[PATH_MAX];
|
||||
Eina_List *dirs = NULL, *l;
|
||||
char *real;
|
||||
|
||||
if (!(d = opendir(getenv("HOME")))) return;
|
||||
while ((de = readdir(d)) != NULL)
|
||||
{
|
||||
char buff[PATH_MAX];
|
||||
|
||||
if (de->d_name[0] == '.') continue;
|
||||
snprintf(buff, sizeof(buff), "%s/%s", getenv("HOME"), de->d_name);
|
||||
if (!ecore_file_is_dir(buff)) continue;
|
||||
real = ecore_file_realpath(buff);
|
||||
dirs = eina_list_append(dirs, real);
|
||||
}
|
||||
closedir(d);
|
||||
|
||||
dirs = eina_list_sort(dirs, ECORE_SORT_MIN, ECORE_COMPARE_CB(strcoll));
|
||||
|
||||
EINA_LIST_FOREACH(dirs, l, real)
|
||||
{
|
||||
Eina_Bool result = EINA_FALSE;
|
||||
|
||||
result = _dir_has_subs(real);
|
||||
if (!result)
|
||||
elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
|
||||
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
|
||||
else
|
||||
elm_genlist_item_append(obj, &itc, eina_stringshare_add(real),
|
||||
NULL, ELM_GENLIST_ITEM_SUBITEMS,
|
||||
NULL, NULL);
|
||||
free(real);
|
||||
}
|
||||
eina_list_free(dirs);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_dir_has_subs(const char *path)
|
||||
{
|
||||
DIR *d;
|
||||
struct dirent *de;
|
||||
char buff[PATH_MAX];
|
||||
Eina_Bool result = EINA_FALSE;
|
||||
|
||||
if (!path) return result;
|
||||
if (!(d = opendir(path))) return result;
|
||||
while ((de = readdir(d)) != NULL)
|
||||
{
|
||||
char buff[PATH_MAX];
|
||||
|
||||
if (de->d_name[0] == '.') continue;
|
||||
snprintf(buff, sizeof(buff), "%s/%s", path, de->d_name);
|
||||
if (ecore_file_is_dir(buff))
|
||||
{
|
||||
result = EINA_TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
closedir(d);
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,25 +1,58 @@
|
|||
#include <Elementary.h>
|
||||
#include "elm_priv.h"
|
||||
|
||||
#define PNL_BTN_WIDTH 32
|
||||
|
||||
/**
|
||||
* @defgroup Panel Panel
|
||||
*
|
||||
* This is a panel object
|
||||
*/
|
||||
|
||||
typedef struct _Widget_Data Widget_Data;
|
||||
struct _Widget_Data
|
||||
{
|
||||
Evas_Object *scr, *bx, *content;
|
||||
Evas_Object *parent, *panel, *content;
|
||||
Elm_Panel_Orient orient;
|
||||
Eina_Bool hidden : 1;
|
||||
};
|
||||
|
||||
static void _del_pre_hook(Evas_Object *obj);
|
||||
static void _del_hook(Evas_Object *obj);
|
||||
static void _theme_hook(Evas_Object *obj);
|
||||
static void _focus_hook(void *data, Evas_Object *obj);
|
||||
static void _sizing_eval(Evas_Object *obj);
|
||||
static void _resize(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
static void _toggle(void *data, Evas_Object *obj, const char *emission, const char *source);
|
||||
static void _layout(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data);
|
||||
static void _parent_resize(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
static void _toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source);
|
||||
static void _changed_size_hints(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
static void _sub_del(void *data, Evas_Object *obj, void *event);
|
||||
static void _panel_show(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
static void _content_resize(void *data, Evas *evas, Evas_Object *obj, void *event);
|
||||
static void _calc(Evas_Object *obj);
|
||||
|
||||
static void
|
||||
_del_pre_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
/* delete callback for edje signal */
|
||||
edje_object_signal_callback_del(wd->panel, "elm,action,panel,toggle",
|
||||
"*", _toggle_panel);
|
||||
/* delete parent resize callback */
|
||||
evas_object_event_callback_del_full(wd->parent, EVAS_CALLBACK_RESIZE,
|
||||
_parent_resize, obj);
|
||||
|
||||
evas_object_event_callback_del_full(obj, EVAS_CALLBACK_SHOW,
|
||||
_panel_show, obj);
|
||||
evas_object_smart_callback_del(obj, "sub-object-del", _sub_del);
|
||||
}
|
||||
|
||||
static void
|
||||
_del_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
elm_panel_content_set(obj, NULL);
|
||||
free(wd);
|
||||
}
|
||||
|
||||
|
|
@ -27,51 +60,265 @@ static void
|
|||
_theme_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) *
|
||||
|
||||
_elm_theme_set(wd->panel, "panel", "base", "default");
|
||||
edje_object_scale_set(wd->panel, elm_widget_scale_get(obj) *
|
||||
_elm_config->scale);
|
||||
|
||||
edje_object_signal_emit(wd->panel, "elm,action,show", "elm");
|
||||
edje_object_message_signal_process(wd->panel);
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
||||
static void
|
||||
_focus_hook(void *data, Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if ((elm_widget_focus_get(obj)) && (wd->content))
|
||||
elm_widget_focus_steal(wd->content);
|
||||
}
|
||||
|
||||
static void
|
||||
_sizing_eval(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Coord mw = -1, mh = -1, vw = 0, vh = 0, w, h;
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Coord pw, ph, ow, oh;
|
||||
|
||||
evas_object_smart_calculate(wd->bx);
|
||||
edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr),
|
||||
&mw, &mh);
|
||||
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
||||
if (w < mw) w = mw;
|
||||
if (h < mh) h = mh;
|
||||
evas_object_resize(wd->scr, w, h);
|
||||
|
||||
evas_object_size_hint_min_get(wd->bx, &mw, &mh);
|
||||
if (w > mw) mw = w;
|
||||
if (h > mh) mh = h;
|
||||
evas_object_resize(wd->bx, mw, mh);
|
||||
|
||||
elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
|
||||
mw = mw + (w - vw);
|
||||
mh = mh + (h - vh);
|
||||
evas_object_size_hint_min_set(obj, mw, mh);
|
||||
evas_object_size_hint_max_set(obj, -1, -1);
|
||||
printf("Sizing Eval\n");
|
||||
evas_object_geometry_get(wd->parent, NULL, NULL, &w, &h);
|
||||
edje_object_size_min_calc(wd->panel, &pw, &ph);
|
||||
printf("\tPanel Min Size: %d %d\n", pw, ph);
|
||||
switch (wd->orient)
|
||||
{
|
||||
case ELM_PANEL_ORIENT_TOP:
|
||||
evas_object_resize(obj, w, pw + PNL_BTN_WIDTH);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_BOTTOM:
|
||||
evas_object_resize(obj, w, pw + PNL_BTN_WIDTH);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_LEFT:
|
||||
evas_object_move(obj, 0, 0);
|
||||
evas_object_resize(obj, pw + PNL_BTN_WIDTH, h);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_RIGHT:
|
||||
evas_object_resize(obj, pw + PNL_BTN_WIDTH, h);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
_parent_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
{
|
||||
_sizing_eval(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_toggle_panel(void *data, Evas_Object *obj, const char *emission, const char *source)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
|
||||
if (wd->hidden)
|
||||
{
|
||||
edje_object_signal_emit(wd->panel, "elm,action,show", "elm");
|
||||
wd->hidden = EINA_FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
edje_object_signal_emit(wd->panel, "elm,action,hide", "elm");
|
||||
wd->hidden = EINA_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_toggle(void *data, Evas_Object *obj, const char *emission, const char *source)
|
||||
_changed_size_hints(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
{
|
||||
|
||||
_sizing_eval(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_layout(Evas_Object *obj, Evas_Object_Box_Data *priv, void *data)
|
||||
_sub_del(void *data, Evas_Object *obj, void *event)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *sub = event;
|
||||
|
||||
if (sub == wd->content)
|
||||
{
|
||||
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
wd->content = NULL;
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_panel_show(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
{
|
||||
// printf("Panel Show Event\n");
|
||||
}
|
||||
|
||||
static void
|
||||
_content_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
|
||||
{
|
||||
// _calc(data);
|
||||
// printf("Content Resize\n");
|
||||
// _sizing_eval(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_calc(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Coord pw, ph;
|
||||
|
||||
printf("Calc\n");
|
||||
evas_object_size_hint_min_get(wd->panel, &pw, &ph);
|
||||
printf("Size Hint: %d %d\n", pw, ph);
|
||||
|
||||
edje_object_size_min_calc(wd->panel, &pw, &ph);
|
||||
printf("\tPanel Min Size: %d %d\n", pw, ph);
|
||||
// if ((pw < 1) || (ph < 1)) return;
|
||||
|
||||
evas_object_geometry_get(wd->parent, NULL, NULL, &w, &h);
|
||||
printf("\tParent Size: %d %d\n", w, h);
|
||||
// if ((w <= 1) || (h <= 1)) return;
|
||||
|
||||
switch (wd->orient)
|
||||
{
|
||||
case ELM_PANEL_ORIENT_TOP:
|
||||
evas_object_resize(obj, w, pw + PNL_BTN_WIDTH);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_BOTTOM:
|
||||
evas_object_resize(obj, w, pw + PNL_BTN_WIDTH);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_LEFT:
|
||||
evas_object_move(wd->panel, 0, 0);
|
||||
evas_object_resize(wd->panel, pw + PNL_BTN_WIDTH, h);
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_RIGHT:
|
||||
evas_object_resize(obj, pw + PNL_BTN_WIDTH, h);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new panel to the parent
|
||||
*
|
||||
* @param parent The parent object
|
||||
* @return The new object or NULL if it cannot be created
|
||||
*
|
||||
* @ingroup Panel
|
||||
*/
|
||||
EAPI Evas_Object *
|
||||
elm_panel_add(Evas_Object *parent)
|
||||
{
|
||||
Evas_Object *obj;
|
||||
Evas *evas;
|
||||
Widget_Data *wd;
|
||||
|
||||
wd = ELM_NEW(Widget_Data);
|
||||
wd->parent = parent;
|
||||
wd->hidden = EINA_FALSE;
|
||||
evas = evas_object_evas_get(parent);
|
||||
|
||||
obj = elm_widget_add(evas);
|
||||
elm_widget_type_set(obj, "panel");
|
||||
elm_widget_sub_object_add(parent, obj);
|
||||
elm_widget_data_set(obj, wd);
|
||||
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
|
||||
elm_widget_del_hook_set(obj, _del_hook);
|
||||
elm_widget_theme_hook_set(obj, _theme_hook);
|
||||
elm_widget_on_focus_hook_set(obj, _focus_hook, NULL);
|
||||
elm_widget_can_focus_set(obj, 1);
|
||||
|
||||
wd->panel = edje_object_add(evas);
|
||||
elm_panel_orient_set(obj, ELM_PANEL_ORIENT_LEFT);
|
||||
elm_widget_resize_object_set(obj, wd->panel);
|
||||
|
||||
/* callback for edje signal */
|
||||
edje_object_signal_callback_add(wd->panel, "elm,action,panel,toggle",
|
||||
"*", _toggle_panel, obj);
|
||||
/* callback to know when parent resizes */
|
||||
evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_RESIZE,
|
||||
_parent_resize, obj);
|
||||
|
||||
/* let's find out when our panel shows itself */
|
||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_SHOW, _panel_show, obj);
|
||||
|
||||
/* and we want to know when the content gets removed */
|
||||
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
|
||||
|
||||
_sizing_eval(obj);
|
||||
return obj;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the panel orientation
|
||||
*
|
||||
* @param obj The panel object
|
||||
* @param orient The orientation to set for this panel object
|
||||
*
|
||||
* @ingroup Panel
|
||||
*/
|
||||
EAPI void
|
||||
elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
wd->orient = orient;
|
||||
switch (orient)
|
||||
{
|
||||
case ELM_PANEL_ORIENT_TOP:
|
||||
_elm_theme_set(wd->panel, "panel", "base", "top");
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_BOTTOM:
|
||||
_elm_theme_set(wd->panel, "panel", "base", "bottom");
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_LEFT:
|
||||
_elm_theme_set(wd->panel, "panel", "base", "left");
|
||||
break;
|
||||
case ELM_PANEL_ORIENT_RIGHT:
|
||||
_elm_theme_set(wd->panel, "panel", "base", "right");
|
||||
break;
|
||||
}
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the panel content
|
||||
*
|
||||
* @param obj The panel object
|
||||
* @param content The content will be filled in this panel object
|
||||
*
|
||||
* @ingroup Panel
|
||||
*/
|
||||
EAPI void
|
||||
elm_panel_content_set(Evas_Object *obj, Evas_Object *content)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
if ((wd->content) && (wd->content != content))
|
||||
{
|
||||
elm_widget_sub_object_del(obj, wd->content);
|
||||
evas_object_event_callback_del_full(wd->content,
|
||||
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
evas_object_event_callback_del_full(wd->content, EVAS_CALLBACK_RESIZE,
|
||||
_content_resize, obj);
|
||||
evas_object_del(wd->content);
|
||||
}
|
||||
wd->content = content;
|
||||
if (content)
|
||||
{
|
||||
elm_widget_sub_object_add(obj, content);
|
||||
edje_object_part_swallow(wd->panel, "elm.swallow.content", content);
|
||||
evas_object_event_callback_add(content,
|
||||
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
evas_object_event_callback_add(content, EVAS_CALLBACK_RESIZE,
|
||||
_content_resize, obj);
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
_calc(obj);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue