commit 9a3f0fea8ef1dce309488cfda13318d573ca323a
parent 49aa2c62e09bc2c599fb4c59b6cd55bbc03ca481
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Sun, 14 Oct 2012 11:16:30 -0600
clean up list() function
Diffstat:
1 file changed, 2 insertions(+), 40 deletions(-)
diff --git a/src/commands.c b/src/commands.c
@@ -1314,21 +1314,10 @@ list(const Arg *arg, void *data)
row = elm_box_add(ad->win);
elm_box_homogeneous_set(row, EINA_FALSE);
elm_box_horizontal_set(row, EINA_TRUE);
- evas_object_size_hint_weight_set(row, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(row, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(ad->event_box, row);
evas_object_show(row);
- label = elm_label_add(ad->win);
- // evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
- elm_box_pack_end(row, label);
- evas_object_show(label);
- char status_buf[512] = "";
- strcat(status_buf, "<font=Monospace font_size=11 backing=on backing_color=#FFF>");
-
- elm_object_text_set(label, status_buf);
-
/*
icon = ewk_settings_icon_database_icon_object_get(ewk_view_url_get(td->view), e);
// evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1340,53 +1329,26 @@ list(const Arg *arg, void *data)
*/
label = elm_label_add(ad->win);
- evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
elm_box_pack_end(row, label);
- evas_object_show(label);
url = strdup_printf("<font=Monospace font_size=11 backing=on backing_color=#FFF>%s</font>",
ewk_view_url_get(td->view));
elm_object_text_set(label, url);
free(url);
+ evas_object_show(label);
label = elm_label_add(ad->win);
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL);
elm_box_pack_end(row, label);
- evas_object_show(label);
-
count_str = strdup_printf("<font=Monospace font_size=11 backing=on backing_color=#FFF>%s</font>",
ewk_view_title_get(td->view));
elm_object_text_set(label, count_str);
free(count_str);
+ evas_object_show(label);
}
evas_object_show(ad->event_box);
-
-
- /*
- elm_layout_sizing_eval(ad->event_box);
-
- int x, y, w, h;
- evas_object_geometry_get(ad->event_box, &x, &y, &w, &h);
- printf("list() event_box is (x, y, w, h) = (%i, %i, %i, %i)\n", x, y, w, h);
- evas_object_move(ad->event_box_bg, x, y);
- evas_object_resize(ad->event_box_bg, w, 100);
- evas_object_show(ad->event_box_bg);
- */
-
-
- /*
- bg = evas_object_rectangle_add(evas_object_evas_get(ad->win));
- // bg = elm_bg_add(ad->event_box);
- evas_object_color_set(bg, 255, 255, 255, 255);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
- // elm_box_pack_end(ad->event_box, bg);
- evas_object_show(bg);
- ecore_evas_object_associate(ecore_evas_ecore_evas_get(evas_object_evas_get(ad->win)), bg, ECORE_EVAS_OBJECT_ASSOCIATE_BASE);
- */
-
return EINA_TRUE;
}