diff options
| author | Trent MacAlpine <tmacalp@gmail.com> | 2015-04-23 23:40:25 -0400 |
|---|---|---|
| committer | Yousuf Philips <philipz85@hotmail.com> | 2015-04-24 17:32:08 +0000 |
| commit | 18a592a5bfc3c4592b7118cceae774fcc00ae94d (patch) | |
| tree | db7fc68463af51b8a97b240c6849414617be9bcc | |
| parent | 0ed75ce4e64411c2b94a0a000f2e00ad95b6446e (diff) | |
tdf#89758 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>
| -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 be9a112fcedc..8863f2f5c0d9 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -165,7 +165,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; + } } } |