Gadgets: Send proper theme strings, and set aspect/size correctly.
This commit is contained in:
parent
e110f912e2
commit
9d0bcd9ce2
|
@ -217,6 +217,16 @@ _backlight_gadget_configure(Evas_Object *g EINA_UNUSED)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_backlight_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
|
||||||
|
{
|
||||||
|
Evas_Coord w, h;
|
||||||
|
Instance *inst = data;
|
||||||
|
|
||||||
|
edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_backlight), 0, 0, &w, &h);
|
||||||
|
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
_backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
@ -225,11 +235,15 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA
|
||||||
if (inst->o_main)
|
if (inst->o_main)
|
||||||
{
|
{
|
||||||
e_gadget_configure_cb_set(inst->o_main, _backlight_gadget_configure);
|
e_gadget_configure_cb_set(inst->o_main, _backlight_gadget_configure);
|
||||||
// _backlight_orient(inst, e_gadget_site_orient_get(obj));
|
|
||||||
|
|
||||||
inst->o_backlight = elm_layout_add(inst->o_main);
|
inst->o_backlight = elm_layout_add(inst->o_main);
|
||||||
E_EXPAND(inst->o_backlight);
|
E_EXPAND(inst->o_backlight);
|
||||||
E_FILL(inst->o_backlight);
|
E_FILL(inst->o_backlight);
|
||||||
|
if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
|
||||||
|
e_theme_edje_object_set(inst->o_backlight,
|
||||||
|
"base/theme/modules/backlight",
|
||||||
|
"e/modules/backlight/main_vert");
|
||||||
|
else
|
||||||
e_theme_edje_object_set(inst->o_backlight,
|
e_theme_edje_object_set(inst->o_backlight,
|
||||||
"base/theme/modules/backlight",
|
"base/theme/modules/backlight",
|
||||||
"e/modules/backlight/main");
|
"e/modules/backlight/main");
|
||||||
|
@ -241,6 +255,10 @@ _backlight_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA
|
||||||
EVAS_CALLBACK_MOUSE_WHEEL,
|
EVAS_CALLBACK_MOUSE_WHEEL,
|
||||||
_backlight_cb_mouse_wheel,
|
_backlight_cb_mouse_wheel,
|
||||||
inst);
|
inst);
|
||||||
|
evas_object_event_callback_add(inst->o_backlight,
|
||||||
|
EVAS_CALLBACK_RESIZE,
|
||||||
|
_backlight_resize_cb,
|
||||||
|
inst);
|
||||||
elm_box_pack_end(inst->o_main, inst->o_backlight);
|
elm_box_pack_end(inst->o_main, inst->o_backlight);
|
||||||
evas_object_show(inst->o_backlight);
|
evas_object_show(inst->o_backlight);
|
||||||
}
|
}
|
||||||
|
@ -268,7 +286,6 @@ backlight_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_
|
||||||
inst->orient = orient;
|
inst->orient = orient;
|
||||||
E_EXPAND(inst->o_main);
|
E_EXPAND(inst->o_main);
|
||||||
E_FILL(inst->o_main);
|
E_FILL(inst->o_main);
|
||||||
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
|
|
||||||
evas_object_smart_callback_add(parent, "gadget_created", _backlight_gadget_created_cb, inst);
|
evas_object_smart_callback_add(parent, "gadget_created", _backlight_gadget_created_cb, inst);
|
||||||
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, backlight_del, inst);
|
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, backlight_del, inst);
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@ struct _Instance
|
||||||
Evas_Object *list;
|
Evas_Object *list;
|
||||||
Evas_Object *slider;
|
Evas_Object *slider;
|
||||||
Evas_Object *check;
|
Evas_Object *check;
|
||||||
|
E_Gadget_Site_Orient orient;
|
||||||
Eina_Bool mute;
|
Eina_Bool mute;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -585,6 +586,16 @@ _mixer_gadget_configure(Evas_Object *g EINA_UNUSED)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_mixer_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
|
||||||
|
{
|
||||||
|
Evas_Coord w, h;
|
||||||
|
Instance *inst = data;
|
||||||
|
|
||||||
|
edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_mixer), 0, 0, &w, &h);
|
||||||
|
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
_mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
@ -597,11 +608,20 @@ _mixer_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNU
|
||||||
inst->o_mixer = elm_layout_add(inst->o_main);
|
inst->o_mixer = elm_layout_add(inst->o_main);
|
||||||
E_EXPAND(inst->o_mixer);
|
E_EXPAND(inst->o_mixer);
|
||||||
E_FILL(inst->o_mixer);
|
E_FILL(inst->o_mixer);
|
||||||
e_theme_edje_object_set(inst->o_mixer, "base/theme/modules/mixer", "e/modules/mixer/main");
|
if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
|
||||||
|
e_theme_edje_object_set(inst->o_mixer,
|
||||||
|
"base/theme/modules/mixer",
|
||||||
|
"e/modules/mixer/main_vert");
|
||||||
|
else
|
||||||
|
e_theme_edje_object_set(inst->o_mixer,
|
||||||
|
"base/theme/modules/mixer",
|
||||||
|
"e/modules/mixer/main");
|
||||||
evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_DOWN,
|
evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_DOWN,
|
||||||
_mouse_down_cb, inst);
|
_mouse_down_cb, inst);
|
||||||
evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_WHEEL,
|
evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_MOUSE_WHEEL,
|
||||||
_mouse_wheel_cb, inst);
|
_mouse_wheel_cb, inst);
|
||||||
|
evas_object_event_callback_add(inst->o_mixer, EVAS_CALLBACK_RESIZE,
|
||||||
|
_mixer_resize_cb, inst);
|
||||||
elm_box_pack_end(inst->o_main, inst->o_mixer);
|
elm_box_pack_end(inst->o_main, inst->o_mixer);
|
||||||
evas_object_show(inst->o_mixer);
|
evas_object_show(inst->o_mixer);
|
||||||
gmixer_context->instances = eina_list_append(gmixer_context->instances, inst);
|
gmixer_context->instances = eina_list_append(gmixer_context->instances, inst);
|
||||||
|
@ -619,15 +639,15 @@ mixer_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
|
||||||
}
|
}
|
||||||
|
|
||||||
EINTERN Evas_Object *
|
EINTERN Evas_Object *
|
||||||
mixer_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient EINA_UNUSED)
|
mixer_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orient orient)
|
||||||
{
|
{
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
|
||||||
inst = E_NEW(Instance, 1);
|
inst = E_NEW(Instance, 1);
|
||||||
inst->o_main = elm_box_add(parent);
|
inst->o_main = elm_box_add(parent);
|
||||||
|
inst->orient = orient;
|
||||||
E_EXPAND(inst->o_main);
|
E_EXPAND(inst->o_main);
|
||||||
E_FILL(inst->o_main);
|
E_FILL(inst->o_main);
|
||||||
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
|
|
||||||
evas_object_show(inst->o_main);
|
evas_object_show(inst->o_main);
|
||||||
|
|
||||||
evas_object_smart_callback_add(parent, "gadget_created", _mixer_gadget_created_cb, inst);
|
evas_object_smart_callback_add(parent, "gadget_created", _mixer_gadget_created_cb, inst);
|
||||||
|
|
|
@ -174,6 +174,8 @@ _xkbg_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UN
|
||||||
snprintf(buf2, sizeof(buf2), "%s (%s)", cl->name, cl->model);
|
snprintf(buf2, sizeof(buf2), "%s (%s)", cl->name, cl->model);
|
||||||
|
|
||||||
ic = elm_icon_add(inst->menu);
|
ic = elm_icon_add(inst->menu);
|
||||||
|
E_EXPAND(ic);
|
||||||
|
E_FILL(ic);
|
||||||
elm_image_file_set(ic, buf, NULL);
|
elm_image_file_set(ic, buf, NULL);
|
||||||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||||
evas_object_show(ic);
|
evas_object_show(ic);
|
||||||
|
@ -194,6 +196,18 @@ _xkbg_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UN
|
||||||
e_xkb_layout_next();
|
e_xkb_layout_next();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_xkbg_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
|
||||||
|
{
|
||||||
|
//Evas_Coord w, h;
|
||||||
|
Instance *inst = data;
|
||||||
|
|
||||||
|
/* This does not work properly yet
|
||||||
|
edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_xkbswitch), 0, 0, &w, &h);
|
||||||
|
evas_object_size_hint_aspect_set(inst->o_xkbswitch, EVAS_ASPECT_CONTROL_BOTH, w, h);*/
|
||||||
|
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_xkbg_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
_xkbg_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
@ -202,7 +216,6 @@ _xkbg_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUS
|
||||||
if (inst->o_main)
|
if (inst->o_main)
|
||||||
{
|
{
|
||||||
e_gadget_configure_cb_set(inst->o_main, _xkbg_gadget_configure);
|
e_gadget_configure_cb_set(inst->o_main, _xkbg_gadget_configure);
|
||||||
// _xkbdswitch_orient(inst, e_gadget_site_orient_get(obj));
|
|
||||||
|
|
||||||
inst->o_xkbswitch = elm_layout_add(inst->o_main);
|
inst->o_xkbswitch = elm_layout_add(inst->o_main);
|
||||||
E_EXPAND(inst->o_xkbswitch);
|
E_EXPAND(inst->o_xkbswitch);
|
||||||
|
@ -210,28 +223,41 @@ _xkbg_gadget_created_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUS
|
||||||
|
|
||||||
inst->layout = e_xkb_layout_get();
|
inst->layout = e_xkb_layout_get();
|
||||||
if (e_config->xkb.only_label || (!inst->layout))
|
if (e_config->xkb.only_label || (!inst->layout))
|
||||||
|
{
|
||||||
|
if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
|
||||||
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
|
"base/theme/modules/xkbswitch",
|
||||||
|
"e/modules/xkbswitch/noflag_vert");
|
||||||
|
else
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"e/modules/xkbswitch/noflag");
|
"e/modules/xkbswitch/noflag");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (inst->orient == E_GADGET_SITE_ORIENT_VERTICAL)
|
||||||
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
|
"base/theme/modules/xkbswitch",
|
||||||
|
"e/modules/xkbswitch/main_vert");
|
||||||
else
|
else
|
||||||
e_theme_edje_object_set(inst->o_xkbswitch,
|
e_theme_edje_object_set(inst->o_xkbswitch,
|
||||||
"base/theme/modules/xkbswitch",
|
"base/theme/modules/xkbswitch",
|
||||||
"e/modules/xkbswitch/main");
|
"e/modules/xkbswitch/main");
|
||||||
|
}
|
||||||
elm_layout_text_set(inst->o_xkbswitch, "e.text.label",
|
elm_layout_text_set(inst->o_xkbswitch, "e.text.label",
|
||||||
inst->layout ? e_xkb_layout_name_reduce(inst->layout->name) : _("NONE"));
|
inst->layout ? e_xkb_layout_name_reduce(inst->layout->name) : _("NONE"));
|
||||||
if (inst->layout && (!e_config->xkb.only_label))
|
if (inst->layout && (!e_config->xkb.only_label))
|
||||||
{
|
{
|
||||||
inst->o_xkbflag = e_icon_add(evas_object_evas_get(inst->o_xkbswitch));
|
inst->o_xkbflag = e_icon_add(evas_object_evas_get(inst->o_xkbswitch));
|
||||||
E_EXPAND(inst->o_xkbflag);
|
|
||||||
E_FILL(inst->o_xkbflag);
|
|
||||||
e_xkb_e_icon_flag_setup(inst->o_xkbflag, inst->layout->name);
|
e_xkb_e_icon_flag_setup(inst->o_xkbflag, inst->layout->name);
|
||||||
/* The icon is part of the gadget. */
|
|
||||||
elm_layout_content_set(inst->o_xkbswitch, "e.swallow.flag",
|
elm_layout_content_set(inst->o_xkbswitch, "e.swallow.flag",
|
||||||
inst->o_xkbflag);
|
inst->o_xkbflag);
|
||||||
}
|
}
|
||||||
else inst->o_xkbflag = NULL;
|
else inst->o_xkbflag = NULL;
|
||||||
evas_object_event_callback_add(inst->o_xkbswitch, EVAS_CALLBACK_MOUSE_DOWN,
|
evas_object_event_callback_add(inst->o_xkbswitch, EVAS_CALLBACK_MOUSE_DOWN,
|
||||||
_xkbg_cb_mouse_down, inst);
|
_xkbg_cb_mouse_down, inst);
|
||||||
|
evas_object_event_callback_add(inst->o_xkbswitch, EVAS_CALLBACK_RESIZE,
|
||||||
|
_xkbg_resize_cb, inst);
|
||||||
elm_box_pack_end(inst->o_main, inst->o_xkbswitch);
|
elm_box_pack_end(inst->o_main, inst->o_xkbswitch);
|
||||||
evas_object_show(inst->o_xkbswitch);
|
evas_object_show(inst->o_xkbswitch);
|
||||||
}
|
}
|
||||||
|
@ -259,7 +285,6 @@ xkbg_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orien
|
||||||
inst->orient = orient;
|
inst->orient = orient;
|
||||||
E_EXPAND(inst->o_main);
|
E_EXPAND(inst->o_main);
|
||||||
E_FILL(inst->o_main);
|
E_FILL(inst->o_main);
|
||||||
evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
|
|
||||||
evas_object_smart_callback_add(parent, "gadget_created", _xkbg_gadget_created_cb, inst);
|
evas_object_smart_callback_add(parent, "gadget_created", _xkbg_gadget_created_cb, inst);
|
||||||
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, xkbg_del, inst);
|
evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, xkbg_del, inst);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue