Revision: 1896
http://geeqie.svn.sourceforge.net/geeqie/?rev=1896&view=rev
Author: zas_
Date: 2010-01-17 13:34:48 +0000 (Sun, 17 Jan 2010)
Log Message:
-----------
Fix osd zoom level refreshing (it was broken since some times).
Modified Paths:
--------------
trunk/src/image-overlay.c
trunk/src/image.c
trunk/src/typedefs.h
Modified: trunk/src/image-overlay.c
===================================================================
--- trunk/src/image-overlay.c 2010-01-13 19:49:39 UTC (rev 1895)
+++ trunk/src/image-overlay.c 2010-01-17 13:34:48 UTC (rev 1896)
@@ -321,7 +321,6 @@
else
{
data = g_strdup(g_hash_table_lookup(vars, name));
- if (data && strcmp(name, "zoom") == 0)
imd->overlay_show_zoom = TRUE;
if (!data)
data = metadata_read_string(imd->image_fd,
name, METADATA_FORMATTED);
}
@@ -865,8 +864,6 @@
{
OverlayStateData *osd = data;
- osd->imd->overlay_show_zoom = FALSE;
-
if (osd->show & OSD_SHOW_INFO)
{
/* redraw when the image was changed,
Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c 2010-01-13 19:49:39 UTC (rev 1895)
+++ trunk/src/image.c 2010-01-17 13:34:48 UTC (rev 1896)
@@ -91,16 +91,7 @@
if (imd->func_update) imd->func_update(imd, imd->data_update);
}
-static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
-{
- ImageWindow *imd = data;
- if (imd->title_show_zoom) image_update_title(imd);
- if (imd->overlay_show_zoom) image_osd_update(imd);
-
- image_update_util(imd);
-}
-
static void image_complete_util(ImageWindow *imd, gboolean preload)
{
if (imd->il && image_get_pixbuf(imd) !=
image_loader_get_pixbuf(imd->il)) return;
@@ -140,6 +131,15 @@
if (imd->func_state) imd->func_state(imd, state, imd->data_state);
}
+static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
+{
+ ImageWindow *imd = data;
+
+ if (imd->title_show_zoom) image_update_title(imd);
+ image_state_set(imd, IMAGE_STATE_IMAGE);
+ image_update_util(imd);
+}
+
/*
*-------------------------------------------------------------------
* misc
Modified: trunk/src/typedefs.h
===================================================================
--- trunk/src/typedefs.h 2010-01-13 19:49:39 UTC (rev 1895)
+++ trunk/src/typedefs.h 2010-01-17 13:34:48 UTC (rev 1896)
@@ -440,8 +440,6 @@
gboolean delay_flip;
gint orientation;
gboolean desaturate;
-
- gboolean overlay_show_zoom; /* set to true if overlay is showing zoom
ratio */
};
#define FILEDATA_MARKS_SIZE 6
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
