diff --git a/src/develop/develop.c b/src/develop/develop.c index eef9b34d3596..1bcacb3b0949 100644 --- a/src/develop/develop.c +++ b/src/develop/develop.c @@ -1042,7 +1042,7 @@ void dt_dev_configure(dt_dev_viewport_t *port) port->width = wd; port->height = ht; port->pipe->changed |= DT_DEV_PIPE_ZOOMED; - dt_dev_zoom_move(port, DT_ZOOM_MOVE, 0.0f, TRUE, 0.0f, 0.0f, TRUE); + dt_dev_zoom_move(port, DT_ZOOM_MOVE, 0.0f, 1, 0.0f, 0.0f, TRUE); } } @@ -3261,9 +3261,10 @@ void dt_dev_zoom_move(dt_dev_viewport_t *port, return; dt_print_pipe(DT_DEBUG_PIPE | DT_DEBUG_CONTROL | DT_DEBUG_VERBOSE, - "dt_dev_zoom_move sets DT_DEV_PIPE_ZOOMED", port->pipe, NULL, DT_DEVICE_NONE, NULL, NULL, "%s%s", - port->widget ? "redraw_widget " : "", - port == &dev->full ? "navigation_redraw" : ""); + "dt_dev_zoom_move", port->pipe, NULL, DT_DEVICE_NONE, NULL, NULL, + "set DT_DEV_PIPE_ZOOMED%s%s", + port->widget ? ", redraw_widget" : "", + port == &dev->full ? ", navigation_redraw" : ""); // Mark pipe as needing zoom update port->pipe->changed |= DT_DEV_PIPE_ZOOMED; diff --git a/src/libs/navigation.c b/src/libs/navigation.c index 975fd476ffec..dfc7138cca0e 100644 --- a/src/libs/navigation.c +++ b/src/libs/navigation.c @@ -545,7 +545,7 @@ static void _lib_navigation_scroll_callback(GtkEventControllerScroll *controller event->scroll.x, event->scroll.y, &x, &y)) dt_dev_zoom_move(&darktable.develop->full, DT_ZOOM_SCROLL, - 0.0f, dy < 0, x, y, constrain); + 0.0f, dy < 0 ? 1 : 0, x, y, constrain); } gdk_event_free(event); } diff --git a/src/views/darkroom.c b/src/views/darkroom.c index dae3d0311977..9657245393e6 100644 --- a/src/views/darkroom.c +++ b/src/views/darkroom.c @@ -3546,7 +3546,7 @@ void enter(dt_view_t *self) } // image should be there now. - dt_dev_zoom_move(&dev->full, DT_ZOOM_MOVE, -1.f, TRUE, 0.0f, 0.0f, TRUE); + dt_dev_zoom_move(&dev->full, DT_ZOOM_MOVE, -1.f, 1, 0.0f, 0.0f, TRUE); /* connect signal for filmstrip image activate */ DT_CONTROL_SIGNAL_HANDLE(DT_SIGNAL_VIEWMANAGER_THUMBTABLE_ACTIVATE, @@ -4567,7 +4567,7 @@ static gboolean _second_window_scrolled_callback(GtkWidget *widget, const gboolean constrained = dev->constrain_zoom && !dt_modifier_is(event->state, GDK_CONTROL_MASK); - dt_dev_zoom_move(port, DT_ZOOM_SCROLL, 0.0f, delta_y < 0, + dt_dev_zoom_move(port, DT_ZOOM_SCROLL, 0.0f, delta_y < 0 ? 1 : 0, event->x, event->y, constrained); } diff --git a/src/views/view.c b/src/views/view.c index 4f6fa99f99f0..3f0b514745b9 100644 --- a/src/views/view.c +++ b/src/views/view.c @@ -1978,7 +1978,7 @@ void dt_view_paint_surface(cairo_t *cr, if(use_preview_fallback) { dt_print_pipe(DT_DEBUG_PIPE | DT_DEBUG_EXPOSE | DT_DEBUG_VERBOSE, - "dt_view_paint_surface sets DT_DEV_PIPE_ZOOMED", port->pipe, NULL, DT_DEVICE_NONE, NULL, NULL); + "dt_view_paint_surface", port->pipe, NULL, DT_DEVICE_NONE, NULL, NULL, "preview fallback set DT_DEV_PIPE_ZOOMED"); port->pipe->changed |= DT_DEV_PIPE_ZOOMED; if(port->pipe->status == DT_DEV_PIXELPIPE_VALID) port->pipe->status = DT_DEV_PIXELPIPE_DIRTY;