Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/thumbbrowserentrybase.cc
+++ b/rtgui/thumbbrowserentrybase.cc
@@ -133,7 +133,6 @@ void ThumbBrowserEntryBase::updateBackBuffer ()
    getTextSizes (infow, infoh);

    int iofs_x = 4, iofs_y = 4;
-    int igap = 2;
    int istartx = prex;
    int istarty = prey;

@@ -155,6 +154,7 @@ void ThumbBrowserEntryBase::updateBackBuffer ()
    istarty += iofs_y;

    if (!bbIcons.empty()) {
+        int igap = 2;
        int iwidth = 0;
        int iheight = 0;

@@ -279,7 +279,6 @@ void ThumbBrowserEntryBase::updateBackBuffer ()
                cc->move_to(textposx_ex, textposy + tpos);
                fn->add_to_cairo_context (cc);
                cc->fill();
-                tpos += exlabh;
            }
        }
    }