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

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
parent 3d7ef4286e 15c18325c0
commit 434e121f99
264 changed files with 6738 additions and 5146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rtgui/thumbbrowserbase.cc
View File

@@ -76,6 +76,10 @@ void ThumbBrowserBase::scroll (int direction, double deltaX, double deltaY)
} else {
delta = deltaY;
}
if (direction == GDK_SCROLL_SMOOTH && delta == 0.0) {
// sometimes this case happens. To avoid scrolling the wrong direction in this case, we just do nothing
return;
}
double coef = direction == GDK_SCROLL_DOWN || (direction == GDK_SCROLL_SMOOTH && delta > 0.0) ? +1.0 : -1.0;
// GUI already acquired when here
@@ -166,33 +170,37 @@ void ThumbBrowserBase::selectSingle (ThumbBrowserEntryBase* clicked)
void ThumbBrowserBase::selectRange (ThumbBrowserEntryBase* clicked, bool additional)
{
if (selected.empty ()) {
addToSelection (clicked, selected);
if (selected.empty()) {
addToSelection(clicked, selected);
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 current = std::find (fd.begin (), fd.end (), clicked);
ThumbIterator front = std::find(fd.begin(), fd.end(), selected.front());
ThumbIterator current = std::find(fd.begin(), fd.end(), clicked);
if (front > current)
std::swap (front, current);
if (front > current) {
std::swap(front, current);
}
clearSelection (selected);
clearSelection(selected);
for (; front <= current; ++front)
addToSelection (*front, selected);
for (; front <= current && front != fd.end(); ++front) {
addToSelection(*front, selected);
}
} else {
// Add an additional range w.r.t. the last clicked entry.
ThumbIterator last = std::find (fd.begin (), fd.end (), lastClicked);
ThumbIterator current = std::find (fd.begin (), fd.end (), clicked);
ThumbIterator last = std::find(fd.begin(), fd.end(), lastClicked);
ThumbIterator current = std::find (fd.begin(), fd.end(), clicked);
if (last > current)
std::swap (last, current);
if (last > current) {
std::swap(last, current);
}
for (; last <= current; ++last)
addToSelection (*last, selected);
for (; last <= current && last != fd.end(); ++last) {
addToSelection(*last, selected);
}
}
}
@@ -337,7 +345,7 @@ void ThumbBrowserBase::selectNext (int distance, bool enlarge)
std::swap(front, back);
}
for (; front <= back; ++front) {
for (; front <= back && front != fd.end(); ++front) {
if (!(*front)->filtered) {
(*front)->selected = true;
redrawNeeded (*front);