Skip to content

Fix calling dt_dev_zoom_move() params #21293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jenshannoschwalm wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −8
Open

Fix calling dt_dev_zoom_move() params #21293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/develop/develop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/libs/navigation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/views/darkroom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/views/view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading