Mercurial > geeqie
diff src/img-view.c @ 23:17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
##### an offical release when making enhancements and translation updates. #####
Fri Mar 18 19:52:38 2005 John Ellis <johne@verizon.net>
* pixbuf-renderer.c: Fix broken 2pass queueing so it merges a single
queue item for each tile, and now that a tile holds a queue pointer
there is no need to walk the tile list to find a possible merge victim.
Thu Mar 17 19:23:56 2005 John Ellis <johne@verizon.net>
* image.c, pixbuf-renderer.[ch]: More progress, and 2 pass zoom now
works again (mostly).
Tue Mar 15 23:17:41 2005 John Ellis <johne@verizon.net>
* image.[ch]: Start conversion to use of PixbufRenderer.
* pixbuf-renderer.[ch]: Additions and fixes for use by ImageWindow.
* fullscreen.c, image-overlay.c, img-view.c, info.c, layout.c,
layout_image.c, print.c: Changes for above ImageWindow conversion.
* typedefs.h: Remove unused ImageWindow variables.
Mon Mar 14 20:45:50 2005 John Ellis <johne@verizon.net>
* pan-view.c: Convert to using new PixbufRenderer.
* pixbuf-renderer.[ch]: Clean up and fixes.
Sun Mar 13 10:21:35 2005 John Ellis <johne@verizon.net>
* image.c (image_scroller_start): Unref scroller pixbuf after adding it
as an overlay to avoid leaking it.
* pixbuf-renderer.[ch]: All functions defined in header file are now
implemented.
Fri Mar 11 17:05:36 2005 John Ellis <johne@verizon.net>
* pixbuf-renderer.[ch]: Set up object properties and additional.
Mar 10 19:22:18 2005 John Ellis <johne@verizon.net>
* pixbuf-renderer.[ch]: FIx scrolling to use old method of gdk_draw and
not gdk_scroll, as scroll often invalidates the entire window (!). Also
merged in source tiles code from image.c.
* pan-view.c: Change picked up when testing PixbufRender zoom.
Tue Mar 8 23:26:00 2005 John Ellis <johne@verizon.net>
* pixbuf-renderer.[ch]: Start of turning image drawing portion of
ImageWindow into an actual GtkWidget.
* src/Makefile.am: Add pixbuf-renderer.[ch].
* pan-view.c: Added temporary hack button and callback for testing
PixbufRenderer widget.
author | gqview |
---|---|
date | Sat, 19 Mar 2005 01:15:17 +0000 |
parents | d907d608745f |
children | 9c0c402b0ef3 |
line wrap: on
line diff
--- a/src/img-view.c Sat Mar 05 21:40:46 2005 +0000 +++ b/src/img-view.c Sat Mar 19 01:15:17 2005 +0000 @@ -23,6 +23,7 @@ #include "image-overlay.h" #include "info.h" #include "menu.h" +#include "pixbuf-renderer.h" #include "slideshow.h" #include "utilops.h" #include "ui_bookmark.h" @@ -317,7 +318,7 @@ ImageWindow *imd; imd = view_window_active_image(vw); - gdk_window_get_origin(imd->image->window, x, y); + gdk_window_get_origin(imd->pr->window, x, y); popup_menu_position_clamp(menu, x, y, 0); } @@ -852,13 +853,11 @@ if (image_zoom_get(vw->imd) == 0.0) { - w = vw->imd->image_width; - h = vw->imd->image_height; + pixbuf_renderer_get_image_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h); } else { - w = vw->imd->width; - h = vw->imd->height; + pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h); } if (limit_window_size) { @@ -875,7 +874,7 @@ req_size.height = h; gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size); - gtk_widget_set_size_request(vw->imd->image, w, h); + gtk_widget_set_size_request(vw->imd->pr, w, h); gtk_widget_show(vw->window); @@ -1369,7 +1368,7 @@ ViewWindow *vw = data; ImageWindow *imd; - if (gtk_drag_get_source_widget(context) == vw->imd->image) return; + if (gtk_drag_get_source_widget(context) == vw->imd->pr) return; imd = vw->imd; @@ -1489,17 +1488,17 @@ imd = vw->imd; - gtk_drag_source_set(imd->image, GDK_BUTTON2_MASK, + gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK, dnd_file_drag_types, dnd_file_drag_types_count, GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); - g_signal_connect(G_OBJECT(imd->image), "drag_data_get", + g_signal_connect(G_OBJECT(imd->pr), "drag_data_get", G_CALLBACK(view_window_set_dnd_data), vw); - gtk_drag_dest_set(imd->image, + gtk_drag_dest_set(imd->pr, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, dnd_file_drop_types, dnd_file_drop_types_count, GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); - g_signal_connect(G_OBJECT(imd->image), "drag_data_received", + g_signal_connect(G_OBJECT(imd->pr), "drag_data_received", G_CALLBACK(view_window_get_dnd_data), vw); }