viking

commit 3325f7328aa1c67f2bd71fa813d2efdeb359d9a1
parent a3fa6089425ccaccc463ad33d89b5c85613e5f6f
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon, 12 Nov 2012 16:44:06 -0700

remove naviframe and use a simple box to show webkit instead

Diffstat:
M
src/buffer.c
 | 
15
++-------------
M
src/viking.h
 | 
3
+--
M
src/window.c
 | 
22
++++++++++++----------

3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
@@ -1105,21 +1105,10 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_
 	evas_object_size_hint_weight_set(bd->view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_size_hint_align_set(bd->view, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-	if (wd->cur_buf) {
-		bd->elm_obj = elm_naviframe_item_insert_after(wd->naviframe,
-				wd->cur_buf->elm_obj,
-				NULL,
-				NULL,
-				NULL,
-				bd->view,
-				NULL);
+	if (wd->cur_buf)
 		wd->buffer_list = eina_list_append_relative(wd->buffer_list, bd, wd->cur_buf);
-		elm_naviframe_item_title_visible_set(bd->elm_obj, EINA_FALSE);
-	}
-	else {
+	else
 		wd->buffer_list = eina_list_append(wd->buffer_list, bd);
-		bd->elm_obj = elm_naviframe_item_simple_push(wd->naviframe, bd->view);
-	}
 
 	Evas_Object *v = bd->view;
 
diff --git a/src/viking.h b/src/viking.h
@@ -170,7 +170,7 @@ typedef struct
 	Evas_Object *win;
 	Evas_Object *bg;
 	Evas_Object *main_box;
-	Evas_Object *naviframe;
+	Evas_Object *webkit_box;
 	Evas_Object *url; /* "inputbox" */
 	Evas_Object *event_box;
 	Evas_Object *status_bar;
@@ -210,7 +210,6 @@ typedef struct
 
 struct _Buffer_Data
 {
-	Elm_Object_Item *elm_obj;
 	Evas_Object *view;
 	unsigned int buf_number;
 
diff --git a/src/window.c b/src/window.c
@@ -361,7 +361,9 @@ window_main_buffer_set(Buffer_Data *new_buf)
 		return;
 
 	if (old_buf) {
+		elm_box_unpack_all(wd->webkit_box);
 		evas_object_hide(old_buf->view);
+
 		// if (old_buf->inspector_enabled)
 		//	ewk_view_web_inspector_close(old_buf->view);
 	}
@@ -369,13 +371,13 @@ window_main_buffer_set(Buffer_Data *new_buf)
 	wd->cur_buf = new_buf;
 
 	if (new_buf) {
+		elm_box_pack_end(wd->webkit_box, new_buf->view);
 		evas_object_show(new_buf->view);
+
 		//if (new_buf->inspector_enabled) {
 		//	ewk_view_web_inspector_show(new_buf->view);
 		//}
 
-		elm_naviframe_item_simple_promote(wd->naviframe, new_buf->view);
-
 		/* left side */
 		make_buffer_number(wd->status_buffer_num, new_buf);
 		make_favicon(wd->status_favicon, new_buf);
@@ -401,7 +403,7 @@ window_add(App_Data *ad, Session_Window *session_window)
 	wd = calloc(1, sizeof(Window_Data));
 	if (!wd) return NULL;
 
-	Evas_Object *win, *bg, *box, *status_bar, *url, *naviframe, *status_url;
+	Evas_Object *win, *bg, *box, *status_bar, *url, *webkit_box, *status_url;
 	Evas_Object *event_box, *web_inspector, *progress, *downloads;
 	Evas_Object *status_back_forward, *status_buffer_num, *status_favicon;
 	Evas_Object *status_count, *status_modkey, *status_zoom, *status_scroll;
@@ -435,12 +437,12 @@ window_add(App_Data *ad, Session_Window *session_window)
 	elm_win_resize_object_add(win, box);
 	evas_object_show(box);
 
-	/* widget that shows the web pages */
-	naviframe = elm_naviframe_add(win);
-	evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-	evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL);
-	elm_box_pack_end(box, naviframe);
-	evas_object_show(naviframe);
+	/* box that shows the web view */
+	webkit_box = elm_box_add(win);
+	evas_object_size_hint_weight_set(webkit_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+	evas_object_size_hint_align_set(webkit_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+	elm_box_pack_end(box, webkit_box);
+	evas_object_show(webkit_box);
 
 	/* status bar container */
 	status_bar = elm_box_add(win);
@@ -536,7 +538,7 @@ window_add(App_Data *ad, Session_Window *session_window)
 	wd->win = win;
 	wd->bg = bg;
 	wd->main_box = box;
-	wd->naviframe = naviframe;
+	wd->webkit_box = webkit_box;
 	wd->url = url;
 	wd->status_buffer_num = status_buffer_num;
 	wd->status_favicon = status_favicon;