viking

commit 35d4ee31a71d5d2957663ab395b4a3d1d2d0cdbe
parent 54e073180d856c2997f2b2fa0df1a5243f9ea871
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Sat, 22 Sep 2012 13:00:53 -0600

ls: show page title right aligned.

Diffstat:
M
commands.c
 | 
51
+++++++++++++++++++++++----------------------------

1 file changed, 23 insertions(+), 28 deletions(-)
diff --git a/commands.c b/commands.c
@@ -1391,54 +1391,49 @@ list(const Arg *arg, void *data)
 	elm_box_clear(ad->event_box);
 
 	EINA_LIST_FOREACH(ad->buffer_list, l, td) {
-	// EINA_LIST_FOREACH(elm_naviframe_items_get(ad->naviframe), l, i) {
-		// web = elm_object_item_part_content_get(i, NULL);
-		url = strdup_printf("<font=Monospace font_size=12>%s", elm_web_uri_get(td->web));
 
 		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, EVAS_HINT_EXPAND);
-		evas_object_size_hint_align_set(row, 0.0, EVAS_HINT_FILL);
+		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(row, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		evas_object_size_hint_align_set(row, 0.0, EVAS_HINT_FILL);
-		elm_box_pack_end(row, label);
-		evas_object_show(label);
-		count_str = strdup_printf("<font=Monospace font_size=12>%i ", td->buf_number);
-		elm_object_text_set(label, count_str);
-		free(count_str);
-
-		// e = evas_object_evas_get(ad->win);
 		icon = ewk_settings_icon_database_icon_object_get(elm_web_uri_get(td->web), e);
-		// evas_object_image_filled_set(icon, EINA_FALSE);
-		// int w, h;
-
-		// evas_object_image_scale_hint_set(icon, EVAS_IMAGE_SCALE_HINT_NONE);
-		evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+		// evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		evas_object_size_hint_align_set(icon, 0.0, EVAS_HINT_FILL);
-
-		// evas_object_image_size_get(icon, &w, &h);
-		// printf("icon for %s has size (%i, %i)\n", url, w, h);
-
 		evas_object_size_hint_max_set(icon, 16, 16);
 		evas_object_size_hint_min_set(icon, 16, 16);
-		// evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_BOTH, 0, 0);
 		elm_box_pack_end(row, icon);
 		evas_object_show(icon);
 
 		label = elm_label_add(ad->win);
-		evas_object_size_hint_weight_set(row, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-		evas_object_size_hint_align_set(row, 0.0, EVAS_HINT_FILL);
+		// 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);
+		count_str = strdup_printf("<font=Monospace font_size=12>%i. ", td->buf_number);
+		elm_object_text_set(label, count_str);
+		free(count_str);
 
-		// url = elm_web_uri_get(web);
+		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=12>%s", elm_web_uri_get(td->web));
 		elm_object_text_set(label, url);
 		free(url);
+
+		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=12>%s", elm_web_title_get(td->web));
+		elm_object_text_set(label, count_str);
+		free(count_str);
 	}
 
 	evas_object_show(ad->event_box);