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

Only reload images for thumbbrowserentrybase::resize if the size has really

Browse Source 
changed. Makes closing preferences, 'I' key faster.
This commit is contained in:
Steve Herrell
2010-12-07 21:33:42 -05:00
parent a3e30e0d05
commit 2ddb6482da
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/thumbbrowserbase.cc
View File

@@ -492,7 +492,8 @@ void ThumbBrowserBase::refreshThumbImages () {
for (int i=0; i<fd.size(); i++){ for (int i=0; i<fd.size(); i++){
previewHeight = getCurrentThumbSize(); previewHeight = getCurrentThumbSize();
fd[i]->resize (previewHeight);// TODO!!! Might be performance bottleneck fd[i]->resize (previewHeight);// TODO!!! Might be performance bottleneck
fd[i]->refreshThumbnailImage (); // TODO: This might cause crashes on some installations /* called if necessary by resize()
fd[i]->refreshThumbnailImage (); TODO: This might cause crashes on some installations */
} }
redraw (); redraw ();

17
rtgui/thumbbrowserentrybase.cc
View File

@@ -22,7 +22,7 @@
#include <mytime.h> #include <mytime.h>
ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname) ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname)
: preview(NULL), buttonSet(NULL), exp_width(0), exp_height(0), redrawRequests(0), : preh(0), preview(NULL), buttonSet(NULL), exp_width(0), exp_height(0), redrawRequests(0),
parent(NULL), filename(fname), exifline(""), datetimeline(""), selected(false), parent(NULL), filename(fname), exifline(""), datetimeline(""), selected(false),
drawable(false),framed(false), processing(false), italicstyle(false), drawable(false),framed(false), processing(false), italicstyle(false),
updatepriority(false) { updatepriority(false) {
@@ -255,9 +255,8 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
void ThumbBrowserEntryBase::resize (int h) { void ThumbBrowserEntryBase::resize (int h) {
delete [] preview;
preview = NULL;
height = h; height = h;
int old_preh = preh;
// dimensions of the button set // dimensions of the button set
int bsw=0, bsh=0; int bsw=0, bsh=0;
@@ -285,9 +284,17 @@ void ThumbBrowserEntryBase::resize (int h) {
if (width < bsw + 2*sideMargin + 2*borderWidth) if (width < bsw + 2*sideMargin + 2*borderWidth)
width = bsw + 2*sideMargin + 2*borderWidth; width = bsw + 2*sideMargin + 2*borderWidth;
} }
// updateBackBuffer ();
refreshThumbnailImage (); if ( preh == old_preh )
{
updateBackBuffer ();
}
else
{
delete [] preview;
preview = NULL;
refreshThumbnailImage ();
}
drawable = true; drawable = true;
} }