Merge branch 'master' into gtk3

2016-09-02 17:51:45 +02:00
parent a6179ef969 db6b43e3c0
commit 9380034b19
8 changed files with 193 additions and 90 deletions
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -1029,8 +1029,7 @@ bool CropWindow::onArea (CursorArea a, int x, int y)
        }

        getObservedFrameArea (x1, y1, w, h);
-        return x > x1 - 6 && y > y1 - 6 && x < x1 + w - 1 + 6 && y < y1 + h - 1 + 6 &&
-               !(x > x1 + 2 && y > y1 + 2 && x < x1 + w - 1 - 2 && y < y1 + h - 1 - 2);
+        return x >= x1 && x <= x1 + w && y >= y1 && y <= y1 + h;
    }

    return false;