improve window duplicate

Author: jcupitt

README.md

@@ -230,8 +230,6 @@ On success, merge to master.
 
 ## TODO
 
-- duplicate could copy zoom/pan settings
-
 - get `object_unref: assertion 'G_IS_OBJECT (object)' failed` during free of
   stack ... seems to be a harmless minor glib bug with `g_clear_object()`
   failing with a crit for a null value

src/imagedisplay.c

@@ -77,6 +77,10 @@ enum {
 	PROP_VADJUSTMENT,
 	PROP_VSCROLL_POLICY,
 
+	/* We need bestfit off for eg. suplicate.
+	 */
+	PROP_BESTFIT,
+
 	/* Control transform with this.
 	 */
 	PROP_BACKGROUND,
@@ -435,6 +439,10 @@ imagedisplay_set_property(GObject *object,
 			g_value_get_object(value));
 		break;
 
+	case PROP_BESTFIT:
+		imagedisplay->bestfit = g_value_get_boolean(value);
+		break;
+
 	case PROP_BACKGROUND:
 		if (imagedisplay->tile_cache)
 			g_object_set(imagedisplay->tile_cache,
@@ -505,6 +513,10 @@ imagedisplay_get_property(GObject *object,
 		g_value_set_object(value, imagedisplay->tile_source);
 		break;
 
+	case PROP_BESTFIT:
+		g_value_set_boolean(value, imagedisplay->bestfit);
+		break;
+
 	case PROP_BACKGROUND:
 		if (imagedisplay->tile_cache)
 			g_object_get_property(G_OBJECT(imagedisplay->tile_cache),
@@ -664,6 +676,13 @@ imagedisplay_class_init(ImagedisplayClass *class)
 			TILE_SOURCE_TYPE,
 			G_PARAM_READWRITE));
 
+	g_object_class_install_property(gobject_class, PROP_BESTFIT,
+		g_param_spec_boolean("bestfit",
+			_("Bestfit"),
+			_("Shrink on first display"),
+			FALSE,
+			G_PARAM_READWRITE));
+
 	g_object_class_install_property(gobject_class, PROP_BACKGROUND,
 		g_param_spec_int("background",
 			_("Background"),

src/imageui.c

@@ -346,8 +346,9 @@ imageui_tick(GtkWidget *widget, GdkFrameClock *frame_clock, gpointer user_data)
 	double new_scale;
 
 #ifdef DEBUG_VERBOSE
+	// FIXME could display FPS from this?
+	printf("imageui_tick: dt = %g\n", dt);
 #endif /*DEBUG_VERBOSE*/
-	printf("image_window_tick: dt = %g\n", dt);
 
 	new_scale = scale;
 
@@ -903,6 +904,29 @@ imageui_new(TileSource *tile_source)
 	return imageui;
 }
 
+Imageui *
+imageui_duplicate(TileSource *tile_source, Imageui *old_imageui)
+{
+	Imageui *new_imageui = imageui_new(tile_source);
+
+	/* We want to copy position and scale, so no bestfit.
+	 */
+	g_object_set(new_imageui->imagedisplay,
+		"bestfit", FALSE,
+		NULL);
+
+	double scale = imageui_get_scale(old_imageui);
+	imageui_set_scale(new_imageui, scale);
+
+	// this won't work until imagedisplay has had a layout :( think about this
+	// again
+	int left, top, width, height;
+	imageui_get_position(old_imageui, &left, &top, &width, &height);
+	imageui_set_position(new_imageui, left, top);
+
+	return new_imageui;
+}
+
 void
 imageui_image_to_gtk(Imageui *imageui,
 	double x_image, double y_image, double *x_gtk, double *y_gtk)
@@ -918,18 +942,3 @@ imageui_gtk_to_image(Imageui *imageui,
 	imagedisplay_gtk_to_image(IMAGEDISPLAY(imageui->imagedisplay),
 		x_gtk, y_gtk, x_image, y_image);
 }
-
-void
-imageui_copy_position(Imageui *new, Imageui *old)
-{
-	copy_adj(
-		gtk_scrolled_window_get_hadjustment(
-			GTK_SCROLLED_WINDOW(new->scrolled_window)),
-		gtk_scrolled_window_get_hadjustment(
-			GTK_SCROLLED_WINDOW(old->scrolled_window)));
-	copy_adj(
-		gtk_scrolled_window_get_vadjustment(
-			GTK_SCROLLED_WINDOW(new->scrolled_window)),
-		gtk_scrolled_window_get_vadjustment(
-			GTK_SCROLLED_WINDOW(old->scrolled_window)));
-}

src/imageui.h

@@ -15,7 +15,6 @@
 
 G_DECLARE_FINAL_TYPE(Imageui, imageui, VIPSDISP, IMAGEUI, GtkWidget)
 
-Imageui *imageui_new(TileSource *tile_source);
 double imageui_get_scale(Imageui *imageui);
 TileSource *imageui_get_tile_source(Imageui *imageui);
 void imageui_get_mouse_position(Imageui *imageui,
@@ -27,10 +26,12 @@ void imageui_magout(Imageui *imageui);
 void imageui_oneone(Imageui *imageui);
 gboolean imageui_scale(Imageui *imageui);
 
+Imageui *imageui_new(TileSource *tile_source);
+Imageui *imageui_duplicate(TileSource *tile_source, Imageui *old_imageui);
+
 void imageui_image_to_gtk(Imageui *imageui,
 	double x_image, double y_image, double *x_gtk, double *y_gtk);
 void imageui_gtk_to_image(Imageui *imageui,
 	double x_gtk, double y_gtk, double *x_image, double *y_image);
-void imageui_copy_position(Imageui *new, Imageui *old);
 
 #endif /* __IMAGEUI_H */

src/imagewindow.c

@@ -658,8 +658,8 @@ image_window_open_current_file(ImageWindow *win,
 		Active *active;
 
 #ifdef DEBUG
-		printf("image_window_open_current_file: %s:\n", filename);
 #endif /*DEBUG*/
+		printf("image_window_open_current_file: %s:\n", filename);
 
 		/* An old image selected again?
 		 */
@@ -990,10 +990,10 @@ image_window_duplicate_action(GSimpleAction *action,
 		TileSource *tile_source = imageui_get_tile_source(win->imageui);
 		g_autoptr(TileSource) new_tile_source = 
 			tile_source_duplicate(tile_source);
-		Imageui *imageui = imageui_new(new_tile_source);
+		Imageui *new_imageui = imageui_duplicate(new_tile_source, win->imageui);
 
-		image_window_imageui_add(new_win, imageui);
-		image_window_imageui_set_visible(new_win, imageui, transition);
+		image_window_imageui_add(new_win, new_imageui);
+		image_window_imageui_set_visible(new_win, new_imageui, transition);
 	}
 
 	gtk_window_present(GTK_WINDOW(new_win));