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

Fix filtered horizontal thumbs

Browse Source 
Take two images, the first in portrait, the second in landscape
orientation. Mark the second with a red dot and filter for red.
Now open that image in SETM. The top tumb is too slim.
This commit is contained in:
Flössie
2017-07-07 20:26:10 +02:00
parent c30683f5f6
commit c792facb73
1 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rtgui/thumbbrowserbase.cc
View File

@@ -523,63 +523,49 @@ void ThumbBrowserBase::arrangeFiles ()
// We could lock it one more time, there's no harm excepted (negligible) speed penalty
//GThreadLock lock;
int N = fd.size ();
// apply filter
for (int i = 0; i < N; i++) {
fd[i]->filtered = !checkFilter (fd[i]);
}
const int N = fd.size();
int rowHeight = 0;
// compute size of the items
for (int i = 0; i < N; i++)
for (int i = 0; i < N; i++) {
// apply filter
fd[i]->filtered = !checkFilter (fd[i]);
// compute size of the items
if (!fd[i]->filtered && fd[i]->getMinimalHeight() > rowHeight) {
rowHeight = fd[i]->getMinimalHeight ();
}
}
if (arrangement == TB_Horizontal) {
numOfCols = 1;
int numOfRows = 1;
// if (rowHeight>0) {
// numOfRows = (internal.get_height()+rowHeight/2)/rowHeight;
// if (numOfRows<1)
// numOfRows = 1;
// }
int ct = 0;
int currx = 0;
while (ct < N) {
// find widest item in the column
int maxw = 0;
for (int i = 0; ct + i < N && i < numOfRows; i++)
if (fd[ct + i]->getMinimalWidth() > maxw) {
maxw = fd[ct + i]->getMinimalWidth ();
}
// arrange items in the column
int curry = 0;
for (int i = 0; ct < N && i < numOfRows; i++, ct++) {
while (ct < N && fd[ct]->filtered) {
fd[ct++]->drawable = false;
}
if (ct < N) {
fd[ct]->setPosition (currx, curry, maxw, rowHeight);
fd[ct]->drawable = true;
curry += rowHeight;
}
while (ct < N && fd[ct]->filtered) {
fd[ct++]->drawable = false;
}
currx += maxw;
if (ct < N) {
const int maxw = fd[ct]->getMinimalWidth();
fd[ct]->setPosition(currx, curry, maxw, rowHeight);
fd[ct]->drawable = true;
currx += maxw;
curry += rowHeight;
++ct;
}
}
MYREADERLOCK_RELEASE(l);
// This will require a Writer access
resizeThumbnailArea (currx, numOfRows * rowHeight);
resizeThumbnailArea (currx, rowHeight);
} else {
int availWidth = internal.get_width();
// initial number of columns