oops, should be 1.0 / scale

Author: jcupitt

src/imagedisplay.c

@@ -666,16 +666,17 @@ imagedisplay_snapshot(GtkWidget *widget, GtkSnapshot *snapshot)
 	paint.size.width = imagedisplay->paint_rect.width;
 	paint.size.height = imagedisplay->paint_rect.height;
 
-	/* Used for tile snapping if there's no gtk snapshot system.
+	/* If there's no gtk snapping, we do our own based on the hardware pixel
+	 * size for the surface this snapshot will be rendered to.
 	 */
 	GtkNative *native = gtk_widget_get_native(widget);
 	GdkSurface *surface = gtk_native_get_surface(native);
-	double scale_factor = gdk_surface_get_scale_factor(surface);
+	double pixel_size = 1.0 / gdk_surface_get_scale_factor(surface);
 
 	if (imagedisplay->tilecache &&
 		imagedisplay->tilecache->n_levels > 0)
 		tilecache_snapshot(imagedisplay->tilecache, snapshot,
-			scale_factor,
+			pixel_size,
 			imagedisplay->scale, imagedisplay->x, imagedisplay->y,
 			&paint, imagedisplay->debug);
 

src/tilecache.c

@@ -841,14 +841,14 @@ tilecache_draw_bounds(GtkSnapshot *snapshot,
  * white lines on tile edges.
  */
 static void
-tilecache_snap_rect_to_boundary(graphene_rect_t *bounds, double scale)
+tilecache_snap_rect_to_boundary(graphene_rect_t *bounds, double pixel_size)
 {
-	double left = rint(bounds->origin.x * scale) / scale;
-	double top = rint(bounds->origin.y * scale) / scale;
+	double left = rint(bounds->origin.x * pixel_size) / pixel_size;
+	double top = rint(bounds->origin.y * pixel_size) / pixel_size;
 	double right = 
-		rint((bounds->origin.x + bounds->size.width) * scale) / scale;
+		rint((bounds->origin.x + bounds->size.width) * pixel_size) / pixel_size;
 	double bottom = 
-		rint((bounds->origin.y + bounds->size.height) * scale) / scale;
+		rint((bounds->origin.y + bounds->size.height) * pixel_size) / pixel_size;
 
 	bounds->origin.x = left;
 	bounds->origin.y = top;
@@ -869,7 +869,7 @@ tilecache_snap_rect_to_boundary(graphene_rect_t *bounds, double scale)
  */
 void
 tilecache_snapshot(Tilecache *tilecache, GtkSnapshot *snapshot,
-	double scale_factor,
+	double pixel_size,
 	double scale, double x, double y, graphene_rect_t *paint, gboolean debug)
 {
 	/* In debug mode, scale and offset so we can see tile clipping.
@@ -975,7 +975,7 @@ tilecache_snapshot(Tilecache *tilecache, GtkSnapshot *snapshot,
 #ifndef HAVE_GTK_SNAPSHOT_SET_SNAP
 			/* Without gtk snap, we have to snap tiles edges ourselves.
 			 */
-			tilecache_snap_rect_to_boundary(&bounds, scale_factor);
+			tilecache_snap_rect_to_boundary(&bounds, pixel_size);
 #endif /*!HAVE_GTK_SNAPSHOT_SET_SNAP*/
 
 			gtk_snapshot_append_scaled_texture(snapshot,

src/tilecache.h

@@ -110,7 +110,7 @@ Tilecache *tilecache_new();
 /* Render the tiles to a snapshot.
  */
 void tilecache_snapshot(Tilecache *tilecache, GtkSnapshot *snapshot,
-	double scale_factor,
+	double pixel_size,
 	double scale, double x, double y, graphene_rect_t *paint, gboolean debug);
 
 #endif /*__TILECACHE_H*/