tweaks

Author: jcupitt

README.md

@@ -241,11 +241,17 @@ On success, merge to master.
 - duplicate should copy more view params? slider settings? scale and
   position?
 
+- looks like duplicate of a texture view will fail ... see
+  tile_source_duplicate()
+
+- next / prev image does not set scale offset etc
+
 - check mem use, esp with three large images loaded
 
 - PDF page change does not change image size if pages vary in size
 
-- add some internal stuff, like pyramid shape, to props display?
+- add some internal stuff, like pyramid shape, to props display? number of
+  loaded tiles?
 
 - ^C during a slow load leaves a file in /tmp, can we fix this?
 

src/displaybar.c

@@ -29,8 +29,7 @@ enum {
 };
 
 static void
-displaybar_tile_source_changed(TileSource *tile_source,
-	Displaybar *displaybar)
+displaybar_tile_source_changed(TileSource *tile_source, Displaybar *displaybar)
 {
 #ifdef DEBUG
 	printf("displaybar_tile_source_changed:\n");
@@ -46,32 +45,28 @@ displaybar_tile_source_changed(TileSource *tile_source,
 		tslider_changed(TSLIDER(displaybar->offset));
 	}
 
-	gtk_spin_button_set_range(
-		GTK_SPIN_BUTTON(displaybar->page),
+	gtk_spin_button_set_range(GTK_SPIN_BUTTON(displaybar->page),
 		0, tile_source->n_pages - 1);
 	gtk_widget_set_sensitive(displaybar->page,
 		tile_source->n_pages > 1 &&
 			tile_source->mode == TILE_SOURCE_MODE_MULTIPAGE);
 }
 
 static void
-displaybar_page_changed(TileSource *tile_source,
-	Displaybar *displaybar)
+displaybar_page_changed(TileSource *tile_source, Displaybar *displaybar)
 {
 #ifdef DEBUG
 	printf("displaybar_page_changed:\n");
 #endif /*DEBUG*/
 
-	gtk_spin_button_set_value(
-		GTK_SPIN_BUTTON(displaybar->page),
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(displaybar->page),
 		tile_source->page);
 }
 
 /* Imagewindow has a new tile_source.
  */
 static void
-displaybar_image_window_changed(ImageWindow *win,
-	Displaybar *displaybar)
+displaybar_image_window_changed(ImageWindow *win, Displaybar *displaybar)
 {
 	TileSource *tile_source;
 
@@ -89,8 +84,7 @@ displaybar_image_window_changed(ImageWindow *win,
 }
 
 static void
-displaybar_set_image_window(Displaybar *displaybar,
-	ImageWindow *win)
+displaybar_set_image_window(Displaybar *displaybar, ImageWindow *win)
 {
 	/* No need to ref ... win holds a ref to us.
 	 */
@@ -179,11 +173,9 @@ displaybar_page_value_changed(GtkSpinButton *spin_button,
 }
 
 static void
-displaybar_scale_value_changed(Tslider *slider,
-	Displaybar *displaybar)
+displaybar_scale_value_changed(Tslider *slider, Displaybar *displaybar)
 {
-	TileSource *tile_source =
-		image_window_get_tile_source(displaybar->win);
+	TileSource *tile_source = image_window_get_tile_source(displaybar->win);
 
 	if (tile_source)
 		g_object_set(tile_source,
@@ -192,11 +184,9 @@ displaybar_scale_value_changed(Tslider *slider,
 }
 
 static void
-displaybar_offset_value_changed(Tslider *slider,
-	Displaybar *displaybar)
+displaybar_offset_value_changed(Tslider *slider, Displaybar *displaybar)
 {
-	TileSource *tile_source =
-		image_window_get_tile_source(displaybar->win);
+	TileSource *tile_source = image_window_get_tile_source(displaybar->win);
 
 	if (tile_source)
 		g_object_set(tile_source,

src/imagewindow.c

@@ -575,7 +575,8 @@ image_window_imageui_set_visible(ImageWindow *win,
 	Imageui *imageui, GtkStackTransitionType transition)
 {
 	TileSource *old_tile_source = image_window_get_tile_source(win);
-	TileSource *new_tile_source = imageui ? imageui_get_tile_source(imageui) : NULL;
+	TileSource *new_tile_source = 
+		imageui ? imageui_get_tile_source(imageui) : NULL;
 
 	VipsImage *image;
 	char *title;
@@ -597,7 +598,8 @@ image_window_imageui_set_visible(ImageWindow *win,
 
 	/* Update title and subtitle.
 	 */
-	title = new_tile_source ? (char *) tile_source_get_path(new_tile_source) : NULL;
+	title = new_tile_source ? 
+		(char *) tile_source_get_path(new_tile_source) : NULL;
 	title = (char *) tile_source_get_path(new_tile_source);
 	gtk_label_set_text(GTK_LABEL(win->title), title ? title : "Untitled");
 
@@ -636,17 +638,18 @@ image_window_imageui_set_visible(ImageWindow *win,
 		 */
 		g_autoptr(GVariant) control = 
 			g_settings_get_value(win->settings, "control");
+
 		g_object_set(new_tile_source,
 			"active", g_variant_get_boolean(control),
 			"visible", TRUE,
 			NULL);
+
+		//tile_source_changed(new_tile_source);
 	}
 
 	// not a ref, so we can just overwrite it
 	win->imageui = imageui;
 
-	image_window_reset_view(win);
-
 	image_window_changed(win);
 }
 
@@ -972,19 +975,18 @@ image_window_duplicate_action(GSimpleAction *action,
 	GVariant *parameter, gpointer user_data)
 {
 	ImageWindow *win = IMAGE_WINDOW(user_data);
+	GtkStackTransitionType transition = GTK_STACK_TRANSITION_TYPE_NONE;
 
 	VipsdispApp *app;
 	ImageWindow *new_win;
 	int width, height;
 
 	g_object_get(win, "application", &app, NULL);
 	new_win = image_window_new(app);
-	gtk_window_present(GTK_WINDOW(new_win));
 
 	new_win->n_files = win->n_files;
 	new_win->files = g_strdupv(win->files);
 	new_win->current_file = win->current_file;
-	image_window_open_current_file(new_win, GTK_STACK_TRANSITION_TYPE_NONE);
 
 	gtk_window_get_default_size(GTK_WINDOW(win), &width, &height);
 	gtk_window_set_default_size(GTK_WINDOW(new_win), width, height);
@@ -994,7 +996,16 @@ image_window_duplicate_action(GSimpleAction *action,
 	copy_state(GTK_WIDGET(new_win), GTK_WIDGET(win), "properties");
 	copy_state(GTK_WIDGET(new_win), GTK_WIDGET(win), "background");
 
-	// FIXME copy other stuff over eg scale, position etc
+	if (win->imageui) {
+		TileSource *tile_source = imageui_get_tile_source(win->imageui);
+		TileSource *new_tile_source = tile_source_duplicate(tile_source);
+		Imageui *imageui = imageui_new(new_tile_source);
+
+		image_window_imageui_add(new_win, imageui);
+		image_window_imageui_set_visible(new_win, imageui, transition);
+	}
+
+	gtk_window_present(GTK_WINDOW(new_win));
 }
 
 static GFile *

src/tilesource.c

@@ -1887,7 +1887,6 @@ tile_source_duplicate(TileSource *tile_source)
 		"falsecolour", &falsecolour,
 		"log", &log,
 		"icc", &icc,
-		"active", &active,
 		NULL);
 
 	g_object_set(new_tile_source,
@@ -1898,7 +1897,6 @@ tile_source_duplicate(TileSource *tile_source)
 		"falsecolour", falsecolour,
 		"log", log,
 		"icc", icc,
-		"active", active,
 		NULL);
 
 	return new_tile_source;