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

Use WEIGHT_SET and ALIGN_SET macros 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-12-01 11:21:12 -05:00
parent 99aee29f57
commit 86d7b94706
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/bin/options_general.c
View File

@ -25,14 +25,14 @@ _options_general(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
/* general frame */
o_frame = elm_frame_add(box);
evas_object_size_hint_weight_set(o_frame, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_frame, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o_frame, "User Interface");
evas_object_show(o_frame);
o = elm_check_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_tooltip_text_set(o, "Translucent");
elm_object_text_set(o, "Translucent");
elm_check_state_set(o, _ex_cfg->gui.translucent);
@ -43,22 +43,22 @@ _options_general(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
/* user frame */
o_frame = elm_frame_add(box);
evas_object_size_hint_weight_set(o_frame, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
WEIGHT_SET(o_frame, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o_frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(o_frame, "User Information");
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);
evas_object_show(tb);
elm_object_content_set(o_frame, tb);
o = elm_label_add(box);
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, 0.0, 0.5);
WEIGHT_SET(o, 0.0, 0.0);
ALIGN_SET(o, 0.0, 0.0);
elm_object_text_set(o, "Nick Name");
evas_object_show(o);
elm_table_pack(tb, o, 0, 0, 1, 1);
@ -69,15 +69,15 @@ _options_general(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
elm_entry_input_panel_layout_set(o, ELM_INPUT_PANEL_LAYOUT_NORMAL);
elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, 0.0);
elm_object_text_set(o, _ex_cfg->nick);
evas_object_show(o);
elm_table_pack(tb, o, 1, 0, 1, 1);
o = elm_label_add(box);
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, 0.0, 0.5);
WEIGHT_SET(o, 0.0, 0.0);
ALIGN_SET(o, 0.0, 0.5);
elm_object_text_set(o, "User Name");
evas_object_show(o);
elm_table_pack(tb, o, 0, 1, 1, 1);
@ -88,8 +88,8 @@ _options_general(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
elm_entry_input_panel_layout_set(o, ELM_INPUT_PANEL_LAYOUT_NORMAL);
elm_scroller_policy_set(o, ELM_SCROLLER_POLICY_OFF,
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, 0.0);
elm_object_text_set(o, _ex_cfg->name);
evas_object_show(o);
elm_table_pack(tb, o, 1, 1, 1, 1);
@ -97,30 +97,29 @@ _options_general(Evas_Object *box, Evas_Object *grid EINA_UNUSED)
/* other options */
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, "Other Options");
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, 0.0);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(vbox, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(vbox, EVAS_HINT_FILL, 0.0);
elm_object_content_set(o_frame, vbox);
evas_object_show(vbox);
o = elm_label_add(box);
elm_object_text_set(o, "Scrollback:");
evas_object_size_hint_weight_set(o, 0.0, 0.0);
evas_object_size_hint_align_set(o, 0.0, 0.5);
WEIGHT_SET(o, 0.0, 0.0);
ALIGN_SET(o, 0.0, 0.5);
elm_box_pack_end(vbox, o);
evas_object_show(o);
o = elm_slider_add(box);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
WEIGHT_SET(o, EVAS_HINT_EXPAND, 0.0);
ALIGN_SET(o, EVAS_HINT_FILL, 0.0);
elm_slider_span_size_set(o, 40);
elm_slider_unit_format_set(o, "%1.0f");
elm_slider_indicator_format_set(o, "%1.0f");