Merge branch 'master' of github.com:aurelienpierreeng/ansel

aurelienpierreeng · Nov 28, 2023 · 9b83ed7 · 9b83ed7
2 parents a4b577e + 3c8f896
commit 9b83ed7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/data/themes/ansel.css b/data/themes/ansel.css
@@ -949,7 +949,7 @@ combobox separator
   ----------------------*/
 notebook tabs,
 #modules-tabs,
-#blending-tabs,
+#blending-header,
 #guides-line
 {
   font-family: sans-serif;
@@ -961,8 +961,9 @@ notebook tabs,
   background-color: @field_active_bg;
 }
 
-#blending-tabs
+#blending-header
 {
+  padding: 0 0.25em;
   background-color: @grey_50;
 }
 
@@ -972,14 +973,14 @@ notebook tabs,
   min-height: 2em;
 }
 
-.dt_plugin_ui #blending-tabs .dt_module_btn,
+.dt_plugin_ui #blending-header .dt_module_btn,
 #guides-line .toggle
 {
   min-height: 1.3em;
 }
 
 #modules-tabs .dt_module_btn,   /* This is needed separately to set a minimal width if panel is really narrow */
-.dt_plugin_ui #blending-tabs .dt_module_btn,
+.dt_plugin_ui #blending-header .dt_module_btn,
 #guides-line .dt_module_btn
 {
   border-radius: 0;
@@ -988,32 +989,12 @@ notebook tabs,
 }
 
 /* reduce and align now hamburger menu of modules and blending tabs */
-.dt_plugin_ui #blending-tabs .dt_module_btn,
+.dt_plugin_ui #blending-header .dt_module_btn,
 #modules-tabs .dt_module_btn
 {
   padding: 0.3em;
 }
 
-#blending-tabs button
-{
-  border-bottom: 3px solid @bg_color;
-  border-top: 3px solid transparent;
-}
-
-#blending-tabs button:active,
-#blending-tabs button:checked,
-#blending-tabs button:selected
-{
-  background-color: transparent;
-  border-bottom: 3px solid @grey_90;
-}
-
-#blending-tabs button:hover
-{
-  border-bottom: 3px solid @grey_100;
-}
-
-
 #search-box entry placeholder {
   color: @grey_25;
 }
@@ -2421,7 +2402,7 @@ box *
 
 notebook tabs,
 #modules-tabs,
-#blending-tabs,
+#blending-header,
 tooltip label,
 .active_menu_item * /* needed for some Pango issues not rendering synthetic bold for all OS */
 {

diff --git a/src/develop/blend_gui.c b/src/develop/blend_gui.c
@@ -2952,7 +2952,7 @@ void dt_iop_gui_init_blending(GtkWidget *iopw, dt_iop_module_t *module)
                               NULL };
     bd->mask_mode_combo = dt_bauhaus_combobox_new_full(
         (dt_action_t *)module, NULL, N_("Blending"),
-        _("Define opacity masks and blinding modes to limit the spatial application of the module."), 0,
+        _("Define opacity masks and blending modes to limit the spatial application of the module."), 0,
         (GtkCallback)_blendop_masks_mode_changed, module, labels);
     GtkWidget *blend_modes_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
@@ -3065,7 +3065,7 @@ void dt_iop_gui_init_blending(GtkWidget *iopw, dt_iop_module_t *module)
     gtk_box_pack_start(GTK_BOX(bd->masks_modes_box), GTK_WIDGET(presets_button), FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(bd->masks_modes_box), FALSE, FALSE, 0);
     dt_gui_add_help_link(GTK_WIDGET(bd->masks_modes_box), dt_get_help_url("masks_blending"));
-    gtk_widget_set_name(GTK_WIDGET(bd->masks_modes_box), "blending-tabs");
+    gtk_widget_set_name(GTK_WIDGET(bd->masks_modes_box), "blending-header");
 
     bd->top_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
     gtk_box_pack_start(GTK_BOX(bd->top_box), blend_modes_hbox, TRUE, TRUE, 0);