diff options
| author | Trent MacAlpine <tmacalp@gmail.com> | 2015-04-23 23:40:25 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-30 08:32:57 +0000 |
| commit | 8c60e9bb90e7954cbdebbf5db8e00ad6879c58f9 (patch) | |
| tree | db1cb11cfe769037ad2785ac751a7670ae9c3ead | |
| parent | e45f01a28eab1db7ef05224a8fb89a438f93c22e (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit 18a592a5bfc3c4592b7118cceae774fcc00ae94d)
Reviewed-on: https://gerrit.libreoffice.org/15521
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sd/source/ui/func/fudraw.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 32c54a3b0be7..a72ac531464b 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; + } } } |