Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c exhibit_tab.c
Log Message:
* Keep the "fit window" setting when the image changes
* Fix mouse wheel with in the fit-to-window mode
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- exhibit_image.c 28 Jul 2006 16:04:47 -0000 1.23
+++ exhibit_image.c 29 Jul 2006 21:18:37 -0000 1.24
@@ -54,6 +54,8 @@
etk_tree_row_scroll_to(row, ETK_FALSE);
}
}
+
+ etk_signal_stop();
}
void
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- exhibit_main.c 29 Jul 2006 20:58:47 -0000 1.54
+++ exhibit_main.c 29 Jul 2006 21:18:37 -0000 1.55
@@ -256,16 +256,16 @@
{
etk_image_set_from_file(ETK_IMAGE(e->cur_tab->image), image);
- /* Use selected option for default view */
- if (e->options->default_view == EX_IMAGE_ONE_TO_ONE)
- _ex_main_button_zoom_one_to_one_cb(NULL, e);
- else if (e->options->default_view == EX_IMAGE_FIT_TO_WINDOW)
- _ex_main_button_fit_to_window_cb(NULL, e);
- else
- {
- etk_image_size_get(ETK_IMAGE(e->cur_tab->image), &w, &h);
- etk_widget_size_request_set(ETK_WIDGET(e->cur_tab->image), w, h);
- }
+ if (e->cur_tab->fit_window)
+ {
+ _ex_main_button_fit_to_window_cb(NULL, e);
+ e->options->default_view = EX_IMAGE_FIT_TO_WINDOW;
+ }
+ else
+ {
+ _ex_main_button_zoom_one_to_one_cb(NULL, e);
+ e->options->default_view = EX_IMAGE_ONE_TO_ONE;
+ }
}
bytes = ecore_file_size(image);
===================================================================
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- exhibit_tab.c 29 Jul 2006 20:58:47 -0000 1.16
+++ exhibit_tab.c 29 Jul 2006 21:18:37 -0000 1.17
@@ -57,6 +57,7 @@
etk_signal_connect("mouse_down", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_down), e);
etk_signal_connect("mouse_up", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_up), e);
etk_signal_connect("mouse_move", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_move), e);
+ etk_signal_connect("mouse_wheel", ETK_OBJECT(tab->image),
ETK_CALLBACK(_ex_image_mouse_wheel), e);
etk_image_keep_aspect_set(ETK_IMAGE(tab->image), ETK_TRUE);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
