enlightenment/express
enlightenment
/
express
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

express: Replace evas_object_size_hint_weight/align set functions with 

MACROS

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-03-03 12:30:58 -05:00
parent 34649d44b2
commit c402734869
6 changed files with 80 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/bin/options_channels.c
View File

@ -139,32 +139,31 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
fr = elm_frame_add(box);
elm_object_text_set(fr, "Channels");
evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, fr);
evas_object_show(fr);
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
elm_box_align_set(vbox, 0.0, 0.0);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(fr, vbox);
evas_object_show(vbox);
tb = elm_table_add(box);
elm_table_homogeneous_set(tb, EINA_FALSE);
elm_table_padding_set(tb, 4, 1);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(vbox, tb);
evas_object_show(tb);
/* servers list */
o_list = elm_list_add(box);
evas_object_size_hint_weight_set(o_list,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(tb, o_list, 0, 0, 1, 3);
evas_object_show(o_list);
@ -182,16 +181,16 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
elm_list_go(o_list);
o = elm_button_add(box);
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o, "clicked", _cb_chl_add, NULL);
elm_object_text_set(o, "Add");
elm_table_pack(tb, o, 1, 0, 1, 1);
evas_object_show(o);
o_del = elm_button_add(box);
evas_object_size_hint_weight_set(o_del, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_del, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_del, "clicked", _cb_chl_del, NULL);
elm_object_text_set(o_del, "Remove");
elm_object_disabled_set(o_del, EINA_TRUE);
@ -200,23 +199,23 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
o = elm_separator_add(box);
elm_separator_horizontal_set(o, EINA_TRUE);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(vbox, o);
evas_object_show(o);
tb = elm_table_add(box);
elm_table_homogeneous_set(tb, EINA_FALSE);
elm_table_padding_set(tb, 4, 1);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(tb, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(tb, EVAS_HINT_FILL, 0.0);
elm_box_pack_end(vbox, tb);
evas_object_show(tb);
o = elm_label_add(box);
elm_object_text_set(o, "Name");
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, 0.0, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, 0.0, EVAS_HINT_FILL);
elm_table_pack(tb, o, 0, 0, 1, 1);
evas_object_show(o);
@ -226,9 +225,8 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
elm_entry_input_panel_layout_set(o_name, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
elm_scroller_policy_set(o_name, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o_name,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_name, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_name, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_name, "changed,user",
_cb_name_changed, NULL);
elm_table_pack(tb, o_name, 1, 0, 2, 1);
@ -236,8 +234,8 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
o = elm_label_add(box);
elm_object_text_set(o, "Password");
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, 0.0, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, 0.0, EVAS_HINT_FILL);
elm_table_pack(tb, o, 0, 1, 1, 1);
evas_object_show(o);
@ -247,9 +245,8 @@ _options_channels(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Networ
elm_entry_input_panel_layout_set(o_pass, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
elm_scroller_policy_set(o_pass, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o_pass,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_pass, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_pass, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_pass, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_pass, "changed,user",
_cb_pass_changed, NULL);
elm_table_pack(tb, o_pass, 1, 1, 2, 1);

23
src/bin/options_font.c
View File

@ -242,25 +242,23 @@ _options_font(Evas_Object *box, Evas_Object *grid)
/* font frame */
o_frame = elm_frame_add(box);
evas_object_size_hint_weight_set(o_frame,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o_frame, "Font");
evas_object_show(o_frame);
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
elm_box_homogeneous_set(vbox, EINA_FALSE);
evas_object_size_hint_weight_set(vbox,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(o_frame, vbox);
evas_object_show(vbox);
/* font size */
hbox = elm_box_add(box);
evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, 0.5);
WEIGHT_SET(hbox, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(hbox, EVAS_HINT_FILL, 0.5);
elm_box_horizontal_set(hbox, EINA_TRUE);
elm_box_pack_end(vbox, hbox);
evas_object_show(hbox);
@ -271,8 +269,8 @@ _options_font(Evas_Object *box, Evas_Object *grid)
evas_object_show(o_small);
o_slider = elm_slider_add(box);
evas_object_size_hint_weight_set(o_slider, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o_slider, EVAS_HINT_FILL, 0.5);
WEIGHT_SET(o_slider, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o_slider, EVAS_HINT_FILL, 0.5);
elm_slider_span_size_set(o_slider, 40);
elm_slider_unit_format_set(o_slider, "%1.0f");
elm_slider_indicator_format_set(o_slider, "%1.0f");
@ -299,9 +297,8 @@ _options_font(Evas_Object *box, Evas_Object *grid)
it_grp->func.text_get = _cb_group_text_get;
o_list = elm_genlist_add(box);
evas_object_size_hint_weight_set(o_list,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_genlist_mode_set(o_list, ELM_LIST_COMPRESS);
elm_genlist_homogeneous_set(o_list, EINA_TRUE);
elm_box_pack_end(vbox, o_list);

26
src/bin/options_networks.c
View File

@ -131,25 +131,23 @@ _options_networks(Evas_Object *box, Evas_Object *base)
/* network frame */
o_frame = elm_frame_add(box);
elm_object_text_set(o_frame, "Networks");
evas_object_size_hint_weight_set(o_frame,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, o_frame);
evas_object_show(o_frame);
tb = elm_table_add(box);
elm_table_homogeneous_set(tb, EINA_FALSE);
elm_table_padding_set(tb, 4, 2);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(o_frame, tb);
evas_object_show(tb);
/* network list */
o_list = elm_list_add(box);
evas_object_size_hint_weight_set(o_list,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(tb, o_list, 0, 0, 1, 4);
evas_object_show(o_list);
@ -167,16 +165,16 @@ _options_networks(Evas_Object *box, Evas_Object *base)
elm_list_go(o_list);
o = elm_button_add(box);
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o, "clicked", _cb_net_add, base);
elm_object_text_set(o, "Add");
elm_table_pack(tb, o, 1, 0, 1, 1);
evas_object_show(o);
o_del = elm_button_add(box);
evas_object_size_hint_weight_set(o_del, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_del, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_del, "clicked", _cb_net_del, NULL);
elm_object_text_set(o_del, "Remove");
elm_object_disabled_set(o_del, EINA_TRUE);
@ -184,8 +182,8 @@ _options_networks(Evas_Object *box, Evas_Object *base)
evas_object_show(o_del);
o_edit = elm_button_add(box);
evas_object_size_hint_weight_set(o_edit, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o_edit, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_edit, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o_edit, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_edit, "clicked", _cb_net_edit, base);
elm_object_text_set(o_edit, "Edit");
elm_object_disabled_set(o_edit, EINA_TRUE);

51
src/bin/options_servers.c
View File

@ -150,32 +150,31 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
fr = elm_frame_add(box);
elm_object_text_set(fr, buff);
evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(box, fr);
evas_object_show(fr);
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
elm_box_align_set(vbox, 0.0, 0.0);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(fr, vbox);
evas_object_show(vbox);
tb = elm_table_add(box);
elm_table_homogeneous_set(tb, EINA_FALSE);
elm_table_padding_set(tb, 4, 1);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(vbox, tb);
evas_object_show(tb);
/* servers list */
o_list = elm_list_add(box);
evas_object_size_hint_weight_set(o_list,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(tb, o_list, 0, 0, 1, 3);
evas_object_show(o_list);
@ -193,16 +192,16 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
elm_list_go(o_list);
o = elm_button_add(box);
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o, "clicked", _cb_srv_add, NULL);
elm_object_text_set(o, "Add");
elm_table_pack(tb, o, 1, 0, 1, 1);
evas_object_show(o);
o_del = elm_button_add(box);
evas_object_size_hint_weight_set(o_del, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_del, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o_del, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_del, "clicked", _cb_srv_del, NULL);
elm_object_text_set(o_del, "Remove");
elm_object_disabled_set(o_del, EINA_TRUE);
@ -211,23 +210,23 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
o = elm_separator_add(box);
elm_separator_horizontal_set(o, EINA_TRUE);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(vbox, o);
evas_object_show(o);
tb = elm_table_add(box);
elm_table_homogeneous_set(tb, EINA_FALSE);
elm_table_padding_set(tb, 4, 1);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(tb, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(tb, EVAS_HINT_FILL, 0.0);
elm_box_pack_end(vbox, tb);
evas_object_show(tb);
o = elm_label_add(box);
elm_object_text_set(o, "Name");
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, 0.0, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, 0.0, EVAS_HINT_FILL);
elm_table_pack(tb, o, 0, 0, 1, 1);
evas_object_show(o);
@ -237,9 +236,8 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
elm_entry_input_panel_layout_set(o_name, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
elm_scroller_policy_set(o_name, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o_name,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_name, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_name, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_name, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_name, "changed,user",
_cb_name_changed, NULL);
elm_table_pack(tb, o_name, 1, 0, 2, 1);
@ -247,8 +245,8 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
o = elm_label_add(box);
elm_object_text_set(o, "Port");
evas_object_size_hint_weight_set(o, EVAS_HINT_FILL, 0.0);
evas_object_size_hint_align_set(o, 0.0, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_FILL, 0.0);
ALIGN_SET(o, 0.0, EVAS_HINT_FILL);
elm_table_pack(tb, o, 0, 1, 1, 1);
evas_object_show(o);
@ -258,9 +256,8 @@ _options_servers(Evas_Object *box, Evas_Object *base EINA_UNUSED, Config_Network
elm_entry_input_panel_layout_set(o_port, ELM_INPUT_PANEL_LAYOUT_PASSWORD);
elm_scroller_policy_set(o_port, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o_port,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_port, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_port, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_port, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_smart_callback_add(o_port, "changed,user",
_cb_port_changed, NULL);
elm_table_pack(tb, o_port, 1, 1, 2, 1);

9
src/bin/options_tools.c
View File

@ -108,9 +108,8 @@ _options_tools(Evas_Object *box, Evas_Object *base, Config_Network *cfg_net)
{
o_box = elm_box_add(box);
elm_box_align_set(o_box, 0.0, 0.0);
evas_object_size_hint_weight_set(o_box,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
edje_object_part_swallow(base, "options_extra", o_box);
evas_object_show(o_box);
@ -119,8 +118,8 @@ _options_tools(Evas_Object *box, Evas_Object *base, Config_Network *cfg_net)
elm_toolbar_select_mode_set(o_tb, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_toolbar_align_set(o_tb, 0.5);
elm_toolbar_homogeneous_set(o_tb, EINA_TRUE);
evas_object_size_hint_weight_set(o_tb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o_tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_tb, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o_tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
#define TB_APPEND(_icon, _label, _opt_mode) \
elm_toolbar_item_append(o_tb, _icon, _label, _cb_option, \

13
src/bin/options_video.c
View File

@ -8,23 +8,22 @@ _options_video(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
/* video frame */
o_frame = elm_frame_add(box);
evas_object_size_hint_weight_set(o_frame,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o_frame, "Video");
evas_object_show(o_frame);
vbox = elm_box_add(box);
elm_box_horizontal_set(vbox, EINA_FALSE);
elm_box_homogeneous_set(vbox, EINA_FALSE);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
ALIGN_SET(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(o_frame, vbox);
evas_object_show(vbox);
o = elm_label_add(box);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, 0.0, EVAS_HINT_FILL);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, 0.0, EVAS_HINT_FILL);
elm_object_text_set(o, "Video Engine");
elm_box_pack_end(vbox, o);
evas_object_show(o);