Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_image.h exhibit_main.c exhibit_tab.c
Log Message:
- patch from Chady to zoom on wheel (made it zoom on Control+Wheel)
- add ability to change images (cycle through them) when wheel is scrolled.
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- exhibit_image.c 26 Dec 2005 12:17:29 -0000 1.15
+++ exhibit_image.c 28 Dec 2005 11:14:17 -0000 1.16
@@ -15,6 +15,47 @@
#define G_VAL(p) ((DATA8 *)(p))[1]
#define B_VAL(p) ((DATA8 *)(p))[0]
+void
+_ex_image_mouse_wheel(Etk_Object *object, void *event, void *data)
+{
+ Exhibit *e;
+ Etk_Event_Mouse_Wheel *ev;
+ Evas *evas;
+
+ ev = event;
+ e = data;
+ evas = ecore_evas_get(ETK_WINDOW(e->win)->ecore_evas);
+
+
+ if(evas_key_modifier_is_set(evas_key_modifier_get(evas), "Control"))
+ {
+ if (ev->z > 0)
+ _ex_main_button_zoom_in_cb(NULL, data);
+ else
+ _ex_main_button_zoom_out_cb(NULL, data);
+ }
+ else
+ {
+ Etk_Tree_Row *row;
+
+ if (ev->z > 0)
+ {
+ row = etk_tree_next_row_get(
+ etk_tree_selected_row_get(e->cur_tab->itree),
+ FALSE, FALSE);
+ etk_tree_row_select(row);
+ etk_tree_row_scroll_to(row, FALSE);
+ }
+ else
+ {
+ row = etk_tree_prev_row_get(
+ etk_tree_selected_row_get(e->cur_tab->itree),
+ FALSE, FALSE);
+ etk_tree_row_select(row);
+ etk_tree_row_scroll_to(row, FALSE);
+ }
+ }
+}
void
_ex_image_mouse_down(Etk_Object *object, void *event, void *data)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_image.h 23 Dec 2005 09:46:14 -0000 1.4
+++ exhibit_image.h 28 Dec 2005 11:14:18 -0000 1.5
@@ -1,6 +1,7 @@
#ifndef _EX_IMAGE_H
#define _EX_IMAGE_H
+void _ex_image_mouse_wheel(Etk_Object *object, void *event, void
*data);
void _ex_image_mouse_down(Etk_Object *object, void *event, void *data);
void _ex_image_mouse_up(Etk_Object *object, void *event, void *data);
void _ex_image_mouse_move(Etk_Object *object, void *event, void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_main.c 26 Dec 2005 14:48:37 -0000 1.25
+++ exhibit_main.c 28 Dec 2005 11:14:18 -0000 1.26
@@ -587,13 +587,24 @@
ev = event;
evas = ecore_evas_get(ETK_WINDOW(e->win)->ecore_evas);
- if(!strcmp(ev->key, "t") &&
evas_key_modifier_is_set(evas_key_modifier_get(evas), "Control"))
+ if(evas_key_modifier_is_set(evas_key_modifier_get(evas), "Control"))
{
- Ex_Tab *tab;
-
- tab = _ex_tab_new(e, e->cur_tab->cur_path);
- _ex_main_window_tab_append(e, tab);
- _ex_main_populate_files(e);
+ if(!strcmp(ev->key, "t"))
+ {
+ Ex_Tab *tab;
+
+ tab = _ex_tab_new(e, e->cur_tab->cur_path);
+ _ex_main_window_tab_append(e, tab);
+ _ex_main_populate_files(e);
+ }
+ else if(!strcmp(ev->key, "w"))
+ {
+ if(evas_list_count(e->tabs) > 1)
+ {
+ //_ex_main_window_tab_remove(e->cur_tab);
+ //_ex_tab_del(e->cur_tab);
+ }
+ }
}
}
@@ -612,6 +623,12 @@
}
void
+_ex_main_window_tab_remove(Ex_Tab *tab)
+{
+
+}
+
+void
_ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab)
{
if(evas_list_count(e->tabs) == 1)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_tab.c 26 Dec 2005 13:59:21 -0000 1.3
+++ exhibit_tab.c 28 Dec 2005 11:14:18 -0000 1.4
@@ -44,6 +44,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), TRUE);
etk_container_add(ETK_CONTAINER(tab->alignment), tab->image);
-------------------------------------------------------
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
