Skip to content

Commit ff26a23

Browse files
authored
Merge pull request #18484 from AlicVB/act_on_selection
act on selection
2 parents 907536b + 4234261 commit ff26a23

File tree

13 files changed

+700
-175
lines changed

13 files changed

+700
-175
lines changed

data/darktableconfig.xml.in

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,6 +1650,13 @@
16501650
<shortdescription>use single-click in the collections module</shortdescription>
16511651
<longdescription>check this option to use single-click to select items in the collections module. this will allow you to do range selections for date-time and numeric values.</longdescription>
16521652
</dtconfig>
1653+
<dtconfig prefs="lighttable" section="general">
1654+
<name>plugins/lighttable/act_on</name>
1655+
<type>bool</type>
1656+
<default>true</default>
1657+
<shortdescription>prioritise the hovered image over the selected images</shortdescription>
1658+
<longdescription>this define how the image to act on list is constructed.</longdescription>
1659+
</dtconfig>
16531660
<dtconfig>
16541661
<name>plugins/lighttable/collect/num_rules</name>
16551662
<type min="1" max="10">int</type>

data/themes/darktable.css

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ dialog .sidebar row:selected:hover label,
657657
}
658658

659659
.dt_section_expander {
660-
padding: 0.07em 0 0.07em 1.7em;
660+
padding: 0.07em 0 0.07em 1.7em;
661661
}
662662

663663
.dt_section_expander,
@@ -1915,16 +1915,24 @@ Details :
19151915
border: 1px solid @lighttable_bg_color;
19161916
}
19171917

1918+
/* set hover effect */
1919+
.dt_act_on_selection #thumb-main:active #thumb-back,
1920+
.dt_act_on_selection #thumb-main:selected #thumb-back
1921+
{
1922+
background-color: @thumbnail_hover_bg_color;
1923+
}
1924+
19181925
/* set selected image and/or focus one */
1919-
#thumb-main:active #thumb-back,
1920-
#thumb-main:selected #thumb-back
1926+
.dt_act_on_hover #thumb-main:active #thumb-back,
1927+
.dt_act_on_hover #thumb-main:selected #thumb-back,
1928+
.dt_act_on_selection #thumb-main:hover #thumb-back
19211929
{
19221930
background-color: shade(@thumbnail_selected_bg_color, 1.05);
19231931
border-color: shade(@thumbnail_selected_bg_color, 1.15);
19241932
}
19251933

19261934
/* set hover effect */
1927-
#thumb-main:hover #thumb-back
1935+
.dt_act_on_hover #thumb-main:hover #thumb-back
19281936
{
19291937
background-color: @thumbnail_hover_bg_color;
19301938
}
@@ -2285,7 +2293,8 @@ Details :
22852293
border: 0.14em solid @plugin_bg_color;
22862294
}
22872295

2288-
.dt_fullview #thumb-main:hover #thumb-image
2296+
.dt_fullview.dt_act_on_hover #thumb-main:hover #thumb-image,
2297+
.dt_fullview.dt_act_on_selection .dt_culling_selected#thumb-main #thumb-image
22892298
{
22902299
border: 0.14em solid @thumbnail_hover_bg_color;
22912300
}

0 commit comments

Comments
 (0)