Skip to content

Commit f29de89

Browse files
jenshannoschwalmTurboGit
authored andcommitted
Some view manager maintenance
Just some constify
1 parent 8df3422 commit f29de89

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/views/view.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void dt_view_manager_cleanup(dt_view_manager_t *vm)
111111
vm->views = NULL;
112112
}
113113

114-
const dt_view_t *dt_view_manager_get_current_view(dt_view_manager_t *vm)
114+
const dt_view_t *dt_view_manager_get_current_view(const dt_view_manager_t *vm)
115115
{
116116
return vm->current_view;
117117
}
@@ -307,7 +307,7 @@ gboolean dt_view_manager_switch_by_view(dt_view_manager_t *vm,
307307

308308
// show we are busy changing views
309309
dt_control_change_cursor(GDK_WATCH);
310-
if(new_view != old_view)
310+
if(new_view != old_view)
311311
dt_gui_process_events();
312312

313313
/* cleanup current view before initialization of new */
@@ -383,7 +383,7 @@ gboolean dt_view_manager_switch_by_view(dt_view_manager_t *vm,
383383
char var[1024];
384384
snprintf(var, sizeof(var), "plugins/%s/%s/expanded",
385385
new_view->module_name, plugin->plugin_name);
386-
gboolean expanded = dt_conf_get_bool(var);
386+
const gboolean expanded = dt_conf_get_bool(var);
387387
dt_lib_gui_set_expanded(plugin, expanded);
388388
dt_lib_set_visible(plugin, TRUE);
389389
}
@@ -447,7 +447,7 @@ gboolean dt_view_manager_switch_by_view(dt_view_manager_t *vm,
447447
return FALSE;
448448
}
449449

450-
const char *dt_view_manager_name(dt_view_manager_t *vm)
450+
const char *dt_view_manager_name(const dt_view_manager_t *vm)
451451
{
452452
if(!vm->current_view)
453453
return "";
@@ -1095,7 +1095,7 @@ void dt_view_active_images_reset(const gboolean raise)
10951095
if(raise)
10961096
DT_CONTROL_SIGNAL_RAISE(DT_SIGNAL_ACTIVE_IMAGES_CHANGE);
10971097
}
1098-
void dt_view_active_images_add(dt_imgid_t imgid, gboolean raise)
1098+
void dt_view_active_images_add(const dt_imgid_t imgid, const gboolean raise)
10991099
{
11001100
darktable.view_manager->active_images =
11011101
g_slist_append(darktable.view_manager->active_images, GINT_TO_POINTER(imgid));
@@ -1123,7 +1123,7 @@ void dt_view_manager_module_toolbox_add(dt_view_manager_t *vm,
11231123
vm->proxy.module_toolbox.add(vm->proxy.module_toolbox.module, tool, views);
11241124
}
11251125

1126-
dt_darkroom_layout_t dt_view_darkroom_get_layout(dt_view_manager_t *vm)
1126+
dt_darkroom_layout_t dt_view_darkroom_get_layout(const dt_view_manager_t *vm)
11271127
{
11281128
if(vm->proxy.darkroom.view)
11291129
return vm->proxy.darkroom.get_layout(vm->proxy.darkroom.view);
@@ -1138,7 +1138,7 @@ void dt_view_lighttable_set_zoom(dt_view_manager_t *vm,
11381138
vm->proxy.lighttable.set_zoom(vm->proxy.lighttable.module, zoom);
11391139
}
11401140

1141-
gint dt_view_lighttable_get_zoom(dt_view_manager_t *vm)
1141+
gint dt_view_lighttable_get_zoom(const dt_view_manager_t *vm)
11421142
{
11431143
if(vm->proxy.lighttable.module)
11441144
return vm->proxy.lighttable.get_zoom(vm->proxy.lighttable.module);
@@ -1716,15 +1716,15 @@ void dt_view_paint_surface(cairo_t *cr,
17161716
port->zoom_x, port->zoom_y };
17171717
dt_dev_distort_transform_plus(dev, port->pipe, 0.0f, DT_DEV_TRANSFORM_DIR_ALL, pts, 3);
17181718

1719-
float offset_x = pts[0] / processed_width - 0.5f;
1720-
float offset_y = pts[1] / processed_height - 0.5f;
1721-
float preview_x = pts[2] / processed_width - 0.5f;
1722-
float preview_y = pts[3] / processed_height - 0.5f;
1723-
float zoom_x = pts[4] / processed_width - 0.5f;
1724-
float zoom_y = pts[5] / processed_height - 0.5f;
1719+
const float offset_x = pts[0] / processed_width - 0.5f;
1720+
const float offset_y = pts[1] / processed_height - 0.5f;
1721+
const float preview_x = pts[2] / processed_width - 0.5f;
1722+
const float preview_y = pts[3] / processed_height - 0.5f;
1723+
const float zoom_x = pts[4] / processed_width - 0.5f;
1724+
const float zoom_y = pts[5] / processed_height - 0.5f;
17251725

1726-
dt_dev_zoom_t zoom = port->zoom;
1727-
int closeup = port->closeup;
1726+
const dt_dev_zoom_t zoom = port->zoom;
1727+
const int closeup = port->closeup;
17281728
const float ppd = port->ppd;
17291729
const double tb = port->border_size;
17301730
const float zoom_scale = dt_dev_get_zoom_scale(port, zoom, 1<<closeup, TRUE);
@@ -1795,8 +1795,8 @@ void dt_view_paint_surface(cairo_t *cr,
17951795
port->pipe->status = DT_DEV_PIXELPIPE_DIRTY;
17961796

17971797
// draw preview
1798-
float wd = processed_width * dev->preview_pipe->processed_width / MAX(1, dev->full.pipe->processed_width);
1799-
float ht = processed_height * dev->preview_pipe->processed_width / MAX(1, dev->full.pipe->processed_width);
1798+
const float wd = processed_width * dev->preview_pipe->processed_width / MAX(1, dev->full.pipe->processed_width);
1799+
const float ht = processed_height * dev->preview_pipe->processed_width / MAX(1, dev->full.pipe->processed_width);
18001800

18011801
cairo_surface_t *preview = dt_view_create_surface(dev->preview_pipe->backbuf,
18021802
dev->preview_pipe->backbuf_width,

src/views/view.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of darktable,
3-
Copyright (C) 2009-2023 darktable developers.
3+
Copyright (C) 2009-2025 darktable developers.
44
55
darktable is free software: you can redistribute it and/or modify
66
it under the terms of the GNU General Public License as published by
@@ -422,7 +422,7 @@ void dt_view_manager_gui_init(dt_view_manager_t *vm);
422422
void dt_view_manager_cleanup(dt_view_manager_t *vm);
423423

424424
/** return translated name. */
425-
const char *dt_view_manager_name(dt_view_manager_t *vm);
425+
const char *dt_view_manager_name(const dt_view_manager_t *vm);
426426
/** switch to this module. returns TRUE if the module fails to change. */
427427
gboolean dt_view_manager_switch(dt_view_manager_t *vm,
428428
const char *view_name);
@@ -438,7 +438,7 @@ void dt_view_manager_expose(dt_view_manager_t *vm,
438438
/** reset current view. */
439439
void dt_view_manager_reset(dt_view_manager_t *vm);
440440
/** get current view of the view manager. */
441-
const dt_view_t *dt_view_manager_get_current_view(dt_view_manager_t *vm);
441+
const dt_view_t *dt_view_manager_get_current_view(const dt_view_manager_t *vm);
442442

443443
void dt_view_manager_mouse_enter(dt_view_manager_t *vm);
444444
void dt_view_manager_mouse_leave(dt_view_manager_t *vm);
@@ -539,7 +539,7 @@ GSList *dt_view_active_images_get();
539539
/** get the lighttable current layout */
540540
dt_lighttable_layout_t dt_view_lighttable_get_layout(dt_view_manager_t *vm);
541541
/** get the darkroom current layout */
542-
dt_darkroom_layout_t dt_view_darkroom_get_layout(dt_view_manager_t *vm);
542+
dt_darkroom_layout_t dt_view_darkroom_get_layout(const dt_view_manager_t *vm);
543543
/** update the layout buttons of the lighttable lib */
544544
void dt_view_lighttable_update_layout_buttons(dt_view_manager_t *vm);
545545
/** get the lighttable culling initial restricted state */
@@ -563,7 +563,7 @@ void dt_view_lighttable_set_preview_state(dt_view_manager_t *vm,
563563
void dt_view_lighttable_set_zoom(dt_view_manager_t *vm,
564564
const gint zoom);
565565
/** gets the lighttable image in row zoom */
566-
gint dt_view_lighttable_get_zoom(dt_view_manager_t *vm);
566+
gint dt_view_lighttable_get_zoom(const dt_view_manager_t *vm);
567567
/** force refresh of culling and/or preview */
568568
void dt_view_lighttable_culling_preview_refresh(dt_view_manager_t *vm);
569569
/** force refresh of culling and/or preview overlays */

0 commit comments

Comments
 (0)