Respect allowed min/max zoom factors.

2004-11-29  Jens Finke  <jens@triq.net>

	* libeog/eog-scroll-view.c (set_zoom_fit): Respect allowed
	min/max zoom factors.

	* shell/eog-window.c (eog_window_construct_ui): Set min widget size
	for scroll_view.
This commit is contained in:
Jens Finke 2004-11-29 20:53:13 +00:00 committed by Jens Finke
parent 6ef8594648
commit cd764bc9f3
3 changed files with 15 additions and 2 deletions

View file

@ -1,3 +1,11 @@
2004-11-29 Jens Finke <jens@triq.net>
* libeog/eog-scroll-view.c (set_zoom_fit): Respect allowed
min/max zoom factors.
* shell/eog-window.c (eog_window_construct_ui): Set min widget size
for scroll_view.
2004-11-28 Dwayne Bailey <dwayne@translate.org.za>
* configure.in: Added "nso" to ALL_LINGUAS.

View file

@ -18,7 +18,7 @@
/* Maximum zoom factor */
#define MAX_ZOOM_FACTOR 20
#define MIN_ZOOM_FACTOR 0.01
#define MIN_ZOOM_FACTOR 0.02
#define CHECK_MEDIUM 8
#define CHECK_BLACK 0x00000000
@ -1009,6 +1009,11 @@ set_zoom_fit (EogScrollView *view)
gdk_pixbuf_get_height (priv->pixbuf),
priv->upscale);
if (new_zoom > MAX_ZOOM_FACTOR)
new_zoom = MAX_ZOOM_FACTOR;
else if (new_zoom < MIN_ZOOM_FACTOR)
new_zoom = MIN_ZOOM_FACTOR;
if (DOUBLE_EQUAL (new_zoom, priv->zoom))
return;

View file

@ -2422,7 +2422,7 @@ eog_window_construct_ui (EogWindow *window, GError **error)
/* the image view for the full size image */
priv->scroll_view = eog_scroll_view_new ();
/* g_object_set (G_OBJECT (priv->scroll_view), "height_request", 250, NULL); */
gtk_widget_set_usize (GTK_WIDGET (priv->scroll_view), 100, 100);
g_signal_connect (G_OBJECT (priv->scroll_view),
"zoom_changed",
(GCallback) view_zoom_changed_cb, window);