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

1
rtgui/filebrowser.cc
View File

@@ -667,6 +667,7 @@ void FileBrowser::close ()
MYWRITERLOCK(l, entryRW); MYWRITERLOCK(l, entryRW);
selected.clear (); selected.clear ();
anchor = nullptr;
MYWRITERLOCK_RELEASE(l); // notifySelectionListener will need read access! MYWRITERLOCK_RELEASE(l); // notifySelectionListener will need read access!

26
rtgui/thumbbrowserbase.cc
View File

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

1
rtgui/thumbbrowserbase.h
View File

@@ -171,6 +171,7 @@ protected:
std::vector<ThumbBrowserEntryBase*> fd; std::vector<ThumbBrowserEntryBase*> fd;
std::vector<ThumbBrowserEntryBase*> selected; std::vector<ThumbBrowserEntryBase*> selected;
ThumbBrowserEntryBase* lastClicked; ThumbBrowserEntryBase* lastClicked;
ThumbBrowserEntryBase* anchor;
int previewHeight; int previewHeight;
int numOfCols; int numOfCols;