forked from enlightenment/efl
parent
91ebde1957
commit
8b910bf656
|
@ -23093,6 +23093,222 @@ collections {
|
|||
}
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// PANES
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
group {
|
||||
name: "elm/panes/vertical/default";
|
||||
images {
|
||||
image: "bt_base1.png" COMP;
|
||||
image: "bt_base2.png" COMP;
|
||||
image: "bt_hilight.png" COMP;
|
||||
image: "bt_shine.png" COMP;
|
||||
image: "bt_glow.png" COMP;
|
||||
image: "bt_dis_base.png" COMP;
|
||||
image: "bt_dis_hilight.png" COMP;
|
||||
}
|
||||
parts
|
||||
{
|
||||
part
|
||||
{
|
||||
name: "whole";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
visible: 0;
|
||||
}
|
||||
}
|
||||
|
||||
//2 contents
|
||||
part
|
||||
{
|
||||
name: "whole_left";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
rel2.to_x: "bar";
|
||||
rel2.relative: 0.0 1.0;
|
||||
visible: 1;
|
||||
}
|
||||
}
|
||||
part
|
||||
{
|
||||
name: "elm.swallow.left";
|
||||
type: SWALLOW;
|
||||
clip_to: "whole_left";
|
||||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
rel1.to: "whole_left";
|
||||
rel2.to: "whole_left";
|
||||
}
|
||||
}
|
||||
|
||||
part
|
||||
{
|
||||
name: "whole_right";
|
||||
type: RECT;
|
||||
mouse_events: 0;
|
||||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
rel1.to_x: "bar";
|
||||
rel1.relative: 1.0 0.0;
|
||||
visible: 1;
|
||||
}
|
||||
}
|
||||
part
|
||||
{
|
||||
name: "elm.swallow.right";
|
||||
type: SWALLOW;
|
||||
clip_to: "whole_right";
|
||||
description
|
||||
{
|
||||
state: "default" 0.0;
|
||||
rel1.to: "whole_right";
|
||||
rel2.to: "whole_right";
|
||||
}
|
||||
}
|
||||
//BAR
|
||||
part { name: "bar";
|
||||
mouse_events: 1;
|
||||
dragable {
|
||||
confine: "whole";
|
||||
x: 1 1 1;
|
||||
y: 0 0 0;
|
||||
}
|
||||
description { state: "default" 0.0;
|
||||
max: 15 999;
|
||||
min: 15 999;
|
||||
image {
|
||||
normal: "bt_base2.png";
|
||||
border: 7 7 7 7;
|
||||
}
|
||||
image.middle: SOLID;
|
||||
}
|
||||
description { state: "clicked" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
image.normal: "bt_base1.png";
|
||||
image.middle: SOLID;
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
image {
|
||||
normal: "bt_dis_base.png";
|
||||
border: 4 4 4 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "over1";
|
||||
mouse_events: 0;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "bar";
|
||||
rel2.to: "bar";
|
||||
rel2.relative: 1.0 0.5;
|
||||
image {
|
||||
normal: "bt_hilight.png";
|
||||
border: 7 7 7 0;
|
||||
}
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
image {
|
||||
normal: "bt_dis_hilight.png";
|
||||
border: 4 4 4 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
part { name: "over2";
|
||||
mouse_events: 1;
|
||||
repeat_events: 1;
|
||||
ignore_flags: ON_HOLD;
|
||||
description { state: "default" 0.0;
|
||||
rel1.to: "bar";
|
||||
rel2.to: "bar";
|
||||
image {
|
||||
normal: "bt_shine.png";
|
||||
border: 7 7 7 7;
|
||||
}
|
||||
}
|
||||
description { state: "disabled" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 0;
|
||||
}
|
||||
}
|
||||
part { name: "over3";
|
||||
mouse_events: 1;
|
||||
repeat_events: 1;
|
||||
description { state: "default" 0.0;
|
||||
color: 255 255 255 0;
|
||||
rel1.to: "bar";
|
||||
rel2.to: "bar";
|
||||
image {
|
||||
normal: "bt_glow.png";
|
||||
border: 12 12 12 12;
|
||||
}
|
||||
fill.smooth : 0;
|
||||
}
|
||||
description { state: "clicked" 0.0;
|
||||
inherit: "default" 0.0;
|
||||
visible: 1;
|
||||
color: 255 255 255 255;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
programs {
|
||||
program {
|
||||
name: "button_click";
|
||||
signal: "mouse,down,1";
|
||||
source: "over2";
|
||||
action: SIGNAL_EMIT "elm,action,press" "";
|
||||
after: "button_click_anim";
|
||||
}
|
||||
program {
|
||||
name: "button_click_anim";
|
||||
action: STATE_SET "clicked" 0.0;
|
||||
target: "bar";
|
||||
}
|
||||
program {
|
||||
name: "button_unclick";
|
||||
signal: "mouse,up,1";
|
||||
source: "over2";
|
||||
action: SIGNAL_EMIT "elm,action,unpress" "";
|
||||
after: "button_unclick_anim";
|
||||
}
|
||||
program {
|
||||
name: "button_unclick_anim";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "bar";
|
||||
}
|
||||
program {
|
||||
name: "button_click2";
|
||||
signal: "mouse,down,1";
|
||||
source: "over3";
|
||||
action: STATE_SET "clicked" 0.0;
|
||||
target: "over3";
|
||||
}
|
||||
program {
|
||||
name: "button_unclick2";
|
||||
signal: "mouse,up,1";
|
||||
source: "over3";
|
||||
action: STATE_SET "default" 0.0;
|
||||
transition: DECELERATE 0.5;
|
||||
target: "over3";
|
||||
}
|
||||
program {
|
||||
name: "button_unclick3";
|
||||
signal: "mouse,up,1";
|
||||
source: "over2";
|
||||
action: SIGNAL_EMIT "elm,action,click" "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
@ -70,6 +70,7 @@ test_notify.c \
|
|||
test_slideshow.c \
|
||||
test_menu.c \
|
||||
test_panel.c \
|
||||
test_panes.c \
|
||||
test_map.c \
|
||||
test_weather.c \
|
||||
test_flip.c \
|
||||
|
|
|
@ -63,6 +63,8 @@ void test_notify(void *data, Evas_Object *obj, void *event_info);
|
|||
void test_slideshow(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_menu(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_panel(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_panes(void *data, Evas_Object *obj, void *event_info);
|
||||
|
||||
void test_map(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_weather(void *data, Evas_Object *obj, void *event_info);
|
||||
void test_flip(void *data, Evas_Object *obj, void *event_info);
|
||||
|
@ -258,6 +260,7 @@ my_win_main(void)
|
|||
ADD_TEST("Slideshow", test_slideshow);
|
||||
ADD_TEST("Menu", test_menu);
|
||||
ADD_TEST("Panel", test_panel);
|
||||
ADD_TEST("Panes", test_panes);
|
||||
ADD_TEST("Map", test_map);
|
||||
ADD_TEST("Weather", test_weather);
|
||||
ADD_TEST("Flip", test_flip);
|
||||
|
|
|
@ -0,0 +1,71 @@
|
|||
#include <Elementary.h>
|
||||
#ifndef ELM_LIB_QUICKLAUNCH
|
||||
|
||||
static Elm_Genlist_Item_Class itc;
|
||||
|
||||
static void
|
||||
_press(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
printf("press\n");
|
||||
}
|
||||
|
||||
static void
|
||||
_unpress(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
printf("unpress\n");
|
||||
}
|
||||
|
||||
static void
|
||||
_clicked(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
printf("clicked\n");
|
||||
}
|
||||
|
||||
void
|
||||
test_panes(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Object *win, *bg, *panes, *bt;
|
||||
char buf[PATH_MAX];
|
||||
Evas_Object *list;
|
||||
|
||||
win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
|
||||
elm_win_title_set(win, "Panes");
|
||||
elm_win_autodel_set(win, 1);
|
||||
|
||||
bg = elm_bg_add(win);
|
||||
elm_win_resize_object_add(win, bg);
|
||||
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_show(bg);
|
||||
|
||||
panes = elm_panes_add(win);
|
||||
elm_win_resize_object_add(win, panes);
|
||||
evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(panes);
|
||||
|
||||
evas_object_smart_callback_add(panes, "clicked", _clicked, panes);
|
||||
evas_object_smart_callback_add(panes, "press", _press, panes);
|
||||
evas_object_smart_callback_add(panes, "unpress", _unpress, panes);
|
||||
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "Left");
|
||||
evas_object_size_hint_weight_set(bt, 1.0, 1.0);
|
||||
evas_object_size_hint_align_set(bt, -1.0, -1.0);
|
||||
evas_object_show(bt);
|
||||
elm_panes_content_left_set(panes, bt);
|
||||
|
||||
bt = elm_button_add(win);
|
||||
elm_button_label_set(bt, "Right");
|
||||
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
evas_object_show(bt);
|
||||
elm_panes_content_right_set(panes, bt);
|
||||
|
||||
|
||||
evas_object_resize(win, 320, 400);
|
||||
evas_object_show(win);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
|
@ -1467,6 +1467,19 @@ extern "C" {
|
|||
EAPI Eina_Bool elm_panel_hidden_get(Evas_Object *obj);
|
||||
EAPI void elm_panel_toggle(Evas_Object *obj);
|
||||
|
||||
|
||||
/**
|
||||
* TODO
|
||||
*
|
||||
* Update the minimun height of the bar in the theme. No minimun should be set in the vertical theme
|
||||
* Add horyzontal theme
|
||||
* Add events (move, start ...)
|
||||
* Add getter of the size of each content (30% - 70% ...)
|
||||
*/
|
||||
EAPI Evas_Object *elm_panes_add(Evas_Object *parent);
|
||||
EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content);
|
||||
EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content);
|
||||
|
||||
typedef enum _Elm_Flip_Mode
|
||||
{
|
||||
ELM_FLIP_ROTATE_Y_CENTER_AXIS,
|
||||
|
|
|
@ -69,6 +69,7 @@ elm_notify.c \
|
|||
elm_slideshow.c \
|
||||
elm_menu.c \
|
||||
elm_panel.c \
|
||||
elm_panes.c \
|
||||
elm_map.c \
|
||||
elm_flip.c \
|
||||
elm_conform.c \
|
||||
|
|
|
@ -0,0 +1,186 @@
|
|||
/*
|
||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h"
|
||||
|
||||
/**
|
||||
* @defgroup Panes panes
|
||||
*
|
||||
*/
|
||||
|
||||
typedef struct _Widget_Data Widget_Data;
|
||||
|
||||
struct _Widget_Data
|
||||
{
|
||||
Evas_Object *panes;
|
||||
|
||||
struct
|
||||
{
|
||||
Evas_Object *left;
|
||||
Evas_Object *right;
|
||||
} contents;
|
||||
};
|
||||
|
||||
static const char *widtype = NULL;
|
||||
static void _del_hook(Evas_Object *obj);
|
||||
static void _theme_hook(Evas_Object *obj);
|
||||
static void _sizing_eval(Evas_Object *obj);
|
||||
static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
|
||||
|
||||
static void
|
||||
_del_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
free(wd);
|
||||
}
|
||||
|
||||
static void
|
||||
_theme_hook(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
if (!wd) return;
|
||||
_elm_theme_object_set(obj, wd->panes, "panes", "vertical", "default");
|
||||
edje_object_scale_set(wd->panes, elm_widget_scale_get(obj) *
|
||||
_elm_config->scale);
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
||||
static void
|
||||
_sizing_eval(Evas_Object *obj)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Coord minw = -1, minh = -1;
|
||||
if (!wd) return;
|
||||
edje_object_size_min_calc(wd->panes, &minw, &minh);
|
||||
evas_object_size_hint_min_set(obj, minw, minh);
|
||||
evas_object_size_hint_max_set(obj, minw, minh);
|
||||
}
|
||||
|
||||
static void
|
||||
_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
_sizing_eval(data);
|
||||
}
|
||||
|
||||
static void
|
||||
_sub_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *sub = event_info;
|
||||
if (!wd) return;
|
||||
if (sub == wd->contents.left)
|
||||
{
|
||||
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
wd->contents.left = NULL;
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
else if (sub == wd->contents.right)
|
||||
{
|
||||
evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_changed_size_hints, obj);
|
||||
wd->contents.right= NULL;
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_clicked(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
evas_object_smart_callback_call(data, "clicked", NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
_press(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
evas_object_smart_callback_call(data, "press", NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
_unpress(void *data, Evas_Object *obj __UNUSED__ , const char *emission __UNUSED__, const char *source __UNUSED__)
|
||||
{
|
||||
evas_object_smart_callback_call(data, "unpress", NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a new panes 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_panes_add(Evas_Object *parent)
|
||||
{
|
||||
Evas_Object *obj;
|
||||
Evas *e;
|
||||
Widget_Data *wd;
|
||||
|
||||
wd = ELM_NEW(Widget_Data);
|
||||
e = evas_object_evas_get(parent);
|
||||
obj = elm_widget_add(e);
|
||||
ELM_SET_WIDTYPE(widtype, "panes");
|
||||
elm_widget_type_set(obj, "panes");
|
||||
elm_widget_sub_object_add(parent, obj);
|
||||
elm_widget_data_set(obj, wd);
|
||||
elm_widget_del_hook_set(obj, _del_hook);
|
||||
elm_widget_theme_hook_set(obj, _theme_hook);
|
||||
|
||||
wd->panes = edje_object_add(e);
|
||||
_elm_theme_object_set(obj, wd->panes, "panes", "vertical", "default");
|
||||
elm_widget_resize_object_set(obj, wd->panes);
|
||||
evas_object_show(wd->panes);
|
||||
|
||||
edje_object_signal_callback_add(wd->panes, "elm,action,click", "", _clicked, obj);
|
||||
edje_object_signal_callback_add(wd->panes, "elm,action,press", "", _press, obj);
|
||||
edje_object_signal_callback_add(wd->panes, "elm,action,unpress", "", _unpress, obj);
|
||||
|
||||
|
||||
|
||||
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
|
||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
|
||||
|
||||
_sizing_eval(obj);
|
||||
return obj;
|
||||
}
|
||||
|
||||
EAPI void elm_panes_content_left_set(Evas_Object *obj, Evas_Object *content)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
if(wd->contents.left)
|
||||
{
|
||||
evas_object_del(wd->contents.left);
|
||||
wd->contents.left = NULL;
|
||||
}
|
||||
|
||||
if(content)
|
||||
{
|
||||
wd->contents.left = content;
|
||||
elm_widget_sub_object_add(obj, content);
|
||||
edje_object_part_swallow(wd->panes, "elm.swallow.left", content);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
EAPI void elm_panes_content_right_set(Evas_Object *obj, Evas_Object *content)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
if(wd->contents.right)
|
||||
{
|
||||
evas_object_del(wd->contents.right);
|
||||
wd->contents.right = NULL;
|
||||
}
|
||||
|
||||
if(content)
|
||||
{
|
||||
wd->contents.right = content;
|
||||
elm_widget_sub_object_add(obj, content);
|
||||
edje_object_part_swallow(wd->panes, "elm.swallow.right", content);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue