Merge ( dcraw made C++ )

2010-11-27 23:38:13 +01:00
parent 7e1e46aee5
commit 20c7a87900
65 changed files with 1399 additions and 607 deletions
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -273,7 +273,7 @@ void ThumbBrowserEntryBase::resize (int h) {
        preh -= infoh + textGap;

        // If the text size was selected very high in preferences this may go negative
-        if (preh<0) preh=0;
+        if (preh<0) preh=30;
    }

    calcThumbnailSize ();