sd/source/ui/func/fudraw.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 8c60e9bb90e7954cbdebbf5db8e00ad6879c58f9
Author: Trent MacAlpine <tmac...@gmail.com>
Date: Thu Apr 23 23:40:25 2015 -0400
tdf#86329 Interactive crop preview shouldn't scale proportionally
Add extra check to keep images proportionally scaling by default
from affecting interactive crop preview rectangle.
Change-Id: I2b15bbc8628934e3d3cf17927885ede890505cd3
Reviewed-on: https://gerrit.libreoffice.org/15505
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 18a592a5bfc3c4592b7118cceae774fcc00ae94d)
Reviewed-on: https://gerrit.libreoffice.org/15521
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 32c54a3..a72ac53 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -164,7 +164,12 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
if (rMarkList.GetMarkCount() == 1)
{
SdrMark* pMark = rMarkList.GetMark(0);
- bIsImageSelected = pMark->GetMarkedSdrObj()->GetObjIdentifier() ==
OBJ_GRAF;
+ // tdf#89758 Extra check to avoid interactive crop preview from
being
+ // proportionally scaled by default.
+ if (mpView->GetDragMode() != SDRDRAG_CROP)
+ {
+ bIsImageSelected =
pMark->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF;
+ }
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
