liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make thumbnail range-selection more similar to OS behaviour, fixes #5393

Browse Source
This commit is contained in:
Ingo Weyrich
2019-07-30 13:22:15 +02:00
parent 287bd5bbe3
commit 6b868a8d4d
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/thumbbrowserbase.cc
View File

@@ -28,7 +28,7 @@
using namespace std;
ThumbBrowserBase::ThumbBrowserBase ()
: location(THLOC_FILEBROWSER), inspector(nullptr), isInspectorActive(false), eventTime(0), lastClicked(nullptr), previewHeight(options.thumbSize), numOfCols(1), arrangement(TB_Horizontal)
: location(THLOC_FILEBROWSER), inspector(nullptr), isInspectorActive(false), eventTime(0), lastClicked(nullptr), anchor(nullptr), previewHeight(options.thumbSize), numOfCols(1), arrangement(TB_Horizontal)
{
inW = -1;
inH = -1;
@@ -162,30 +162,29 @@ inline void removeFromSelection (const ThumbIterator& iterator, ThumbVector& sel
void ThumbBrowserBase::selectSingle (ThumbBrowserEntryBase* clicked)
{
clearSelection (selected);
clearSelection(selected);
anchor = clicked;
if (clicked)
addToSelection (clicked, selected);
if (clicked) {
addToSelection(clicked, selected);
}
}
void ThumbBrowserBase::selectRange (ThumbBrowserEntryBase* clicked, bool additional)
{
if (selected.empty()) {
if (selected.empty() && !anchor) {
addToSelection(clicked, selected);
anchor = clicked;
return;
}
if (!additional || !lastClicked) {
// Extend the current range w.r.t to first selected entry.
ThumbIterator front = std::find(fd.begin(), fd.end(), selected.front());
ThumbIterator back;
ThumbIterator current = std::find(fd.begin(), fd.end(), clicked);
ThumbIterator back = std::find(fd.begin(), fd.end(), clicked);
ThumbIterator front = std::find(fd.begin(), fd.end(), anchor);
if (front > current) {
front = current;
back = std::find(fd.begin(), fd.end(), selected.back());
} else {
back = current;
if (front > back) {
std::swap(front, back);
}
clearSelection(selected);
@@ -217,6 +216,7 @@ void ThumbBrowserBase::selectSet (ThumbBrowserEntryBase* clicked)
} else {
addToSelection (clicked, selected);
}
anchor = clicked;
}
static void scrollToEntry (double& h, double& v, int iw, int ih, ThumbBrowserEntryBase* entry)