Merge branch 'master' into gtk3

2016-02-23 09:26:00 +01:00
parent 34734350be e16a505e04
commit cb916f7c2d
17 changed files with 132 additions and 73 deletions
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -476,7 +476,13 @@ void ImageArea::addCropWindow ()
    cw->setEditSubscriber (getCurrSubscriber());
    cw->enable(); // start processing!

-    cw->centerCrop();
+    {
+    int anchorX = 0;
+    int anchorY = 0;
+    mainCropWindow->getCropAnchorPosition(anchorX, anchorY);
+    cw->setCropAnchorPosition(anchorX, anchorY);
+    }
+
    mainCropWindow->setObservedCropWin (cropWins.front());

    if(cropWins.size() == 1) { // after first detail window we already have high quality