Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c exhibit_tab.c
Log Message:
- more work on tabs.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- exhibit.h 26 Dec 2005 12:17:29 -0000 1.6
+++ exhibit.h 26 Dec 2005 13:55:35 -0000 1.7
@@ -44,6 +44,9 @@
{
char *dir;
char cur_path[PATH_MAX];
+ int num;
+
+ Etk_Bool fit_window;
Evas_List *images;
Evas_List *dirs;
@@ -99,7 +102,6 @@
int zoom;
int brightness;
int contrast;
- Etk_Bool fit_window;
Evas_List *tabs;
Ex_Tab *cur_tab;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- exhibit_main.c 26 Dec 2005 12:17:29 -0000 1.22
+++ exhibit_main.c 26 Dec 2005 13:55:35 -0000 1.23
@@ -19,7 +19,7 @@
void
_ex_main_statusbar_zoom_update(Exhibit *e)
{
- if (e->fit_window)
+ if (e->cur_tab->fit_window)
{
etk_statusbar_pop(ETK_STATUSBAR(e->statusbar[2]), 0);
etk_statusbar_push(ETK_STATUSBAR(e->statusbar[2]), _("Fit to window"),
0);
@@ -53,12 +53,16 @@
e = data;
- if (e->fit_window)
+ if (e->cur_tab->fit_window)
{
- etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ if(evas_list_count(e->tabs) == 1)
+ etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
- e->fit_window = FALSE;
+ e->cur_tab->fit_window = FALSE;
}
if(e->zoom == ZOOM_MAX)
@@ -77,12 +81,16 @@
e = data;
- if (e->fit_window)
+ if (e->cur_tab->fit_window)
{
- etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ if(evas_list_count(e->tabs) == 1)
+ etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
- e->fit_window = FALSE;
+ e->cur_tab->fit_window = FALSE;
}
if(e->zoom <= ZOOM_MIN)
@@ -101,12 +109,16 @@
e = data;
- if (e->fit_window)
+ if (e->cur_tab->fit_window)
{
- etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ if(evas_list_count(e->tabs) == 1)
+ etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->scrolled_view, TRUE);
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook),
e->cur_tab->num, e->cur_tab->scrolled_view);
+
etk_widget_size_request_set(e->cur_tab->alignment, -1, -1);
etk_scrolled_view_add_with_viewport(ETK_SCROLLED_VIEW(e->cur_tab->scrolled_view),
e->cur_tab->alignment);
- e->fit_window = FALSE;
+ e->cur_tab->fit_window = FALSE;
}
e->zoom = 0;
@@ -124,14 +136,18 @@
e = data;
- if (e->fit_window)
+ if (e->cur_tab->fit_window)
return;
etk_widget_size_request_set(e->cur_tab->alignment, 10, 10);
- etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->alignment, TRUE);
+ if(evas_list_count(e->tabs) == 1)
+ etk_paned_add2(ETK_PANED(e->hpaned), e->cur_tab->alignment, TRUE);
+ else
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e->notebook), e->cur_tab->num,
e->cur_tab->alignment);
+
etk_widget_size_request_set(e->cur_tab->image, -1, -1);
- e->fit_window = TRUE;
+ e->cur_tab->fit_window = TRUE;
_ex_main_statusbar_zoom_update(e);
}
@@ -767,7 +783,7 @@
etk_signal_connect("clicked", ETK_OBJECT(e->entry[1]),
ETK_CALLBACK(_ex_main_goto_dir_clicked_cb), e);
/* create first tab but dont place it in notebook */
- tab = _ex_tab_new(e, dir);
+ tab = _ex_tab_new(e, dir);
e->cur_tab = tab;
e->tabs = evas_list_append(e->tabs, tab);
_ex_tab_select(tab);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_tab.c 26 Dec 2005 12:17:30 -0000 1.1
+++ exhibit_tab.c 26 Dec 2005 13:55:35 -0000 1.2
@@ -7,6 +7,7 @@
Etk_Tree_Model *imodel;
tab = calloc(1, sizeof(Ex_Tab));
+ tab->num = evas_list_count(e->tabs);
tab->dirs = NULL;
tab->images = NULL;
tab->e = e;
@@ -79,16 +80,6 @@
etk_widget_show(tab->image);
etk_widget_show(tab->alignment);
etk_widget_show(tab->scrolled_view);
-
-// etk_widget_size_recalc_queue(tab->e->table);
-// etk_widget_size_recalc_queue(tab->itree);
-// etk_widget_size_recalc_queue(tab->dtree);
-// etk_widget_size_recalc_queue(tab->alignment);
-
-// etk_widget_redraw_queue(tab->e->table);
-// etk_widget_redraw_queue(tab->itree);
-// etk_widget_redraw_queue(tab->dtree);
-// etk_widget_redraw_queue(tab->alignment);
-
-// etk_widget_show_all(tab->e->win);
+
+ etk_widget_show_all(tab->e->win);
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
