diff options
| -rw-r--r-- | src/eulogium.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 8834e0f..7688fb4 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -101,14 +101,12 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) object = elm_label_add(table); elm_object_text_set(object, "Print time remaining \%d hours."); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 0, 3, 1); object = elm_label_add(table); elm_object_text_set(object, "Preparing to print:"); /* TODO change to print state string */ - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 1, 3, 1); @@ -118,7 +116,6 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) elm_label_slide_mode_set(object, ELM_LABEL_SLIDE_MODE_AUTO); elm_label_slide_duration_set(object, 8); elm_object_style_set(object, "slide_bounce"); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 2, 3, 1); @@ -129,7 +126,6 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) elm_progressbar_pulse(eulogium->print.progress, EINA_FALSE); elm_progressbar_value_set(eulogium->print.progress, 0.5); elm_progressbar_unit_format_set(eulogium->print.progress, "%1.0f%%"); - evas_object_size_hint_weight_set(eulogium->print.progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(eulogium->print.progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(eulogium->print.progress); elm_table_pack(table, eulogium->print.progress, 0, 3, 3, 1); @@ -143,7 +139,7 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5); object = evas_object_rectangle_add(evas_object_evas_get(eulogium->layout)); evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff); evas_object_size_hint_min_set(object, 0, 1); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_padding_set(object, 1, 1, 1, 1); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 4, 3, 1); @@ -151,7 +147,6 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5); object = elm_button_add(table); elm_object_text_set(object, "TUNE"); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 5, 1, 1); @@ -165,7 +160,7 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5); object = evas_object_rectangle_add(evas_object_evas_get(eulogium->layout)); evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff); evas_object_size_hint_min_set(object, 1, 0); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_padding_set(object, 1, 1, 1, 1); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 1, 5, 1, 1); @@ -173,14 +168,12 @@ elm_progressbar_value_set(eulogium->print.progress, 0.5); object = elm_button_add(table); elm_object_text_set(object, "PAUSE"); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 2, 5, 1, 1); object = elm_label_add(table); elm_object_text_set(object, "Mat: %%d meter"); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 6, 3, 1); @@ -380,7 +373,7 @@ Evas_Object *eulogium_tripple_button_menu(struct eulogium_data *eulogium, object = evas_object_rectangle_add(table); evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff); evas_object_size_hint_min_set(object, 1, 0); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_padding_set(object, 1, 1, 1, 1); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 1, 0, 1, 1); @@ -401,7 +394,7 @@ Evas_Object *eulogium_tripple_button_menu(struct eulogium_data *eulogium, object = evas_object_rectangle_add(table); evas_object_color_set(object, 0x33, 0x99, 0xff, 0xff); evas_object_size_hint_min_set(object, 0, 1); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_padding_set(object, 1, 1, 1, 1); evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(object); elm_table_pack(table, object, 0, 1, 3, 1); |