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

Minor cleanups

Browse Source
This commit is contained in:
Ingo Weyrich 2019-07-29 14:41:36 +02:00
parent fede0c0366
commit 4e4106b4e7
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/filebrowser.cc
View File

@ -1496,7 +1496,7 @@ bool FileBrowser::checkFilter (ThumbBrowserEntryBase* entryb) const // true ->
for (const auto& entry : filter.vFilterStrings) { for (const auto& entry : filter.vFilterStrings) {
if (FileName.find(entry) != std::string::npos) { if (FileName.find(entry) != std::string::npos) {
iFilenameMatch++; ++iFilenameMatch;
break; break;
} }
} }

22
rtgui/filebrowserentry.cc
View File

@ -251,32 +251,32 @@ void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rten
bool newLandscape = img->getWidth() > img->getHeight(); bool newLandscape = img->getWidth() > img->getHeight();
bool rotated = false; bool rotated = false;
if (preh == img->getHeight ()) { if (preh == img->getHeight()) {
const bool resize = !preview || prew != img->getWidth();
prew = img->getWidth (); prew = img->getWidth ();
GThreadLock lock; GThreadLock lock;
// Check if image has been rotated since last time // Check if image has been rotated since last time
rotated = preview != nullptr && newLandscape != landscape; rotated = preview && newLandscape != landscape;
guint8* temp = preview; if (resize) {
preview = nullptr; delete [] preview;
delete [] temp; preview = new guint8 [prew * preh * 3];
temp = new guint8 [prew * preh * 3]; }
memcpy (temp, img->getData(), prew * preh * 3); memcpy(preview, img->getData(), prew * preh * 3);
preview = temp;
updateBackBuffer (); updateBackBuffer ();
} }
landscape = newLandscape; landscape = newLandscape;
img->free (); img->free();
if (parent != nullptr) { if (parent) {
if (rotated) { if (rotated) {
parent->thumbRearrangementNeeded(); parent->thumbRearrangementNeeded();
} else if (redrawRequests == 0) { } else if (redrawRequests == 0) {
parent->redrawNeeded (this); parent->redrawNeeded(this);
} }
} }
} }

16
rtgui/filecatalog.cc
View File

@ -804,28 +804,28 @@ void FileCatalog::previewsFinishedUI ()
{ {
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
redrawAll (); redrawAll();
previewsToLoad = 0; previewsToLoad = 0;
if (filterPanel) { if (filterPanel) {
filterPanel->set_sensitive (true); filterPanel->set_sensitive(true);
if ( !hasValidCurrentEFS ) { if (!hasValidCurrentEFS) {
MyMutex::MyLock lock(dirEFSMutex); MyMutex::MyLock myLock(dirEFSMutex);
currentEFS = dirEFS; currentEFS = dirEFS;
filterPanel->setFilter ( dirEFS, true ); filterPanel->setFilter(dirEFS, true);
} else { } else {
filterPanel->setFilter ( currentEFS, false ); filterPanel->setFilter(currentEFS, false);
} }
} }
if (exportPanel) { if (exportPanel) {
exportPanel->set_sensitive (true); exportPanel->set_sensitive(true);
} }
// restart anything that might have been loaded low quality // restart anything that might have been loaded low quality
fileBrowser->refreshQuickThumbImages(); fileBrowser->refreshQuickThumbImages();
fileBrowser->applyFilter (getFilter()); // refresh total image count fileBrowser->applyFilter(getFilter()); // refresh total image count
_refreshProgressBar(); _refreshProgressBar();
} }
filepanel->loadingThumbs(M("PROGRESSBAR_READY"), 0); filepanel->loadingThumbs(M("PROGRESSBAR_READY"), 0);