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

Fixed filmstrip autoheight; see issue #700

Browse Source
This commit is contained in:
Oliver Duis 2011-06-06 16:04:27 +02:00
parent 8fe4055b92
commit 4fcb84a74c
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/filecatalog.cc
View File

@ -542,7 +542,7 @@ void FileCatalog::refreshAll () {
} }
void FileCatalog::refreshHeight () { void FileCatalog::refreshHeight () {
int newHeight=fileBrowser->getEffectiveHeight(); int newHeight=fileBrowser->getEffectiveHeight() + buttonBar->get_height();
set_size_request(0, newHeight); set_size_request(0, newHeight);
} }

5
rtgui/thumbbrowserbase.cc
View File

@ -631,14 +631,15 @@ void ThumbBrowserBase::setScrollPosition (double h, double v) {
// needed for auto-height in single tab // needed for auto-height in single tab
int ThumbBrowserBase::getEffectiveHeight() { int ThumbBrowserBase::getEffectiveHeight() {
int h=0; int h=hscroll.get_height() + 2; // have 2 pixels rounding error for scroll bars to appear
{ {
// TODO: Check for Linux // TODO: Check for Linux
#ifdef WIN32 #ifdef WIN32
Glib::Mutex::Lock lock(entryMutex); Glib::Mutex::Lock lock(entryMutex);
#endif #endif
if (fd.size()>0) h=fd[0]->getEffectiveHeight(); if (fd.size()>0) h+=fd[0]->getEffectiveHeight();
} }
return h; return h;

2
rtgui/thumbbrowserentrybase.h
View File

@ -102,7 +102,7 @@ protected:
int getMinimalHeight () { return height; } int getMinimalHeight () { return height; }
int getMinimalWidth () { return width; } int getMinimalWidth () { return width; }
int getEffectiveHeight () { return fnlabh+dtlabh+exlabh+textGap+exp_height; } int getEffectiveHeight () { return exp_height; }
int getStartX () { return startx; } int getStartX () { return startx; }
int getStartY () { return starty; } int getStartY () { return starty; }