Mercurial > geeqie.yaz

diff src/img-view.c @ 885:ad420f2eb789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use a specific enum for image.zoom_mode values (ZoomMode) and simplify calls to image_zoom_get_default(), dropping last parameter which was always options->image.zoom_mode.
author zas_
date Tue, 15 Jul 2008 12:52:02 +0000
parents db6977f8b0f1
children d8e1e820cee7
line wrap: on
line diff
--- a/src/img-view.c	Sun Jul 13 14:50:07 2008 +0000
+++ b/src/img-view.c	Tue Jul 15 12:52:02 2008 +0000
@@ -135,7 +135,7 @@
 
 	if (info)
 		{
-		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
+		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
 
 		if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
 		}
@@ -166,7 +166,7 @@
 
 	if (info)
 		{
-		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode));
+		image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
 		if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
 		}
 }
@@ -226,7 +226,7 @@
 
 	vw->list_pointer = work;
 	fd = work->data;
-	image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+	image_change_fd(imd, fd, image_zoom_get_default(imd));
 
 	if (options->image.enable_read_ahead && work_ahead)
 		{
@@ -257,7 +257,7 @@
 
 	vw->list_pointer = work;
 	fd = work->data;
-	image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+	image_change_fd(imd, fd, image_zoom_get_default(imd));
 
 	if (options->image.enable_read_ahead && work_ahead)
 		{
@@ -872,7 +872,7 @@
 			 G_CALLBACK(view_window_key_press_cb), vw);
 	if (cd && info)
 		{
-		image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->image.zoom_mode));
+		image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
 		if (options->image.enable_read_ahead)
 			{
 			CollectInfo * r_info = collection_next_by_info(cd, info);
@@ -884,7 +884,7 @@
 		{
 		view_window_set_list(vw, list);
 		vw->list_pointer = vw->list;
-		image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->image.zoom_mode));
+		image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
 
 		if (options->image.enable_read_ahead)
 			{
@@ -894,7 +894,7 @@
 		}
 	else
 		{
-		image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->image.zoom_mode));
+		image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
 		}
 
 	if (image_zoom_get(vw->imd) == 0.0)
@@ -1386,7 +1386,7 @@
 
 		vw->list_pointer = vw->list;
 		fd = vw->list->data;
-		image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->image.zoom_mode));
+		image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
 
 		work = vw->list->next;
 		if (options->image.enable_read_ahead && work)
@@ -1397,7 +1397,7 @@
 		}
 	else
 		{
-		image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->image.zoom_mode));
+		image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
 		}
 }
 
@@ -1516,7 +1516,7 @@
 
 				if (source && info_list)
 					{
-					image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->image.zoom_mode));
+					image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
 					}
 				else
 					{
@@ -1527,7 +1527,7 @@
 
 						vw->list_pointer = vw->list;
 						}
-					image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+					image_change_fd(imd, fd, image_zoom_get_default(imd));
 					}
 				}
 			}
@@ -1633,7 +1633,7 @@
 			}
 		if (image_get_fd(imd) == image_fd)
 			{
-			image_change_fd(imd, NULL, image_zoom_get_default(imd, options->image.zoom_mode));
+			image_change_fd(imd, NULL, image_zoom_get_default(imd));
 			}
 		}
 
@@ -1679,7 +1679,7 @@
 				fd = NULL;
 				}
 
-			image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode));
+			image_change_fd(imd, fd, image_zoom_get_default(imd));
 			}
 		}