Merge pull request #18318 from dterrahe/regressions20250129

Fix a couple of regressions
darktable-org · Jan 29, 2025 · 0b2a3b7 · 0b2a3b7
2 parents a5e2ab3 + 9ffffb7
commit 0b2a3b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/libs/tools/module_toolbox.c b/src/libs/tools/module_toolbox.c
@@ -97,6 +97,7 @@ void view_enter(dt_lib_module_t *self,
 {
   dt_lib_module_toolbox_t *d = self->data;
   dt_view_type_flags_t nv= new_view->view(new_view);
+  gtk_widget_set_no_show_all(d->container, TRUE);
   for(const GList *child_elt = d->child_views; child_elt; child_elt = g_list_next(child_elt))
   {
     child_data_t* child_data = child_elt->data;

diff --git a/src/libs/tools/view_toolbox.c b/src/libs/tools/view_toolbox.c
@@ -96,6 +96,7 @@ void view_enter(dt_lib_module_t *self,
 {
   dt_lib_view_toolbox_t *d = self->data;
   dt_view_type_flags_t nv= new_view->view(new_view);
+  gtk_widget_set_no_show_all(d->container, TRUE);
 
   for(const GList *child_elt = d->child_views;
       child_elt;

diff --git a/src/views/darkroom.c b/src/views/darkroom.c
@@ -683,12 +683,14 @@ void expose(dt_view_t *self,
 
   // don't draw guides and color pickers on image margins
   cairo_rectangle(cri, tb, tb, width - 2.0 * tb, height - 2.0 * tb);
-  cairo_clip(cri);
 
   cairo_translate(cri, 0.5 * width, 0.5 * height);
   cairo_scale(cri, zoom_scale, zoom_scale);
   cairo_translate(cri, -.5f * wd - zoom_x * wd, -.5f * ht - zoom_y * ht);
 
+  cairo_save(cri);
+  cairo_clip(cri);
+
   // Displaying sample areas if enabled
   if(darktable.lib->proxy.colorpicker.live_samples
      && (darktable.lib->proxy.colorpicker.display_samples
@@ -719,7 +721,7 @@ void expose(dt_view_t *self,
     _darkroom_pickers_draw(self, cri, wd, ht, zoom_scale, &samples, TRUE);
   }
 
-  cairo_reset_clip(cri);
+  cairo_restore(cri);
 
   dt_iop_module_t *dmod = dev->gui_module;