fixed a bug of imagebrowser

This commit is contained in:
NaBian committed 2018-11-12 14:29:48 +08:00
1 parent e7fe4de812
commit df00d8b69a
1 file changed
+17 -32
+17 -32
View File
@@ -586,52 +586,32 @@ namespace HandyControl.Controls
if (!_isLoaded) return; if (!_isLoaded) return;
if (ImageWidth < 0.001 || ImageHeight < 0.001) return; if (ImageWidth < 0.001 || ImageHeight < 0.001) return;
var scaleX = (ImageMargin.Left + ImageWidth * .5) / sizeInfo.PreviousSize.Width;
var scaleY = (ImageMargin.Top + ImageHeight * .5) / sizeInfo.PreviousSize.Height;
var marginX = scaleX * ActualWidth - ImageWidth * .5;
var marginY = scaleY * ActualHeight - ImageHeight * .5;
_canMoveX = true; _canMoveX = true;
_canMoveY = true; _canMoveY = true;
var marginX = ImageMargin.Left;
var marginY = ImageMargin.Top;
if (ImageWidth <= ActualWidth) if (ImageWidth <= ActualWidth)
{ {
_canMoveX = false; _canMoveX = false;
marginX = (ActualWidth - ImageWidth) / 2; marginX = (ActualWidth - ImageWidth) / 2;
} }
else if (Math.Abs(ImageMargin.Left) < 0.001)
{
marginX = 0;
}
else
{
var right = Math.Abs(_borderMove.Width - _canvasSmallImg.ActualWidth + _borderMove.Margin.Left);
if (right < 0.001)
{
marginX = ActualWidth - ImageWidth;
}
}
if (ImageHeight <= ActualHeight) if (ImageHeight <= ActualHeight)
{ {
_canMoveY = false; _canMoveY = false;
marginY = (ActualHeight - ImageHeight) / 2; marginY = (ActualHeight - ImageHeight) / 2;
} }
else if (Math.Abs(ImageMargin.Top) < 0.001)
{
marginY = 0;
}
else
{
var top = Math.Abs(_borderMove.Height - _canvasSmallImg.ActualHeight + _borderMove.Margin.Top);
if (top < 0.001)
{
marginY = ActualHeight - ImageHeight;
}
}
ImageMargin = new Thickness(marginX, marginY, 0, 0); ImageMargin = new Thickness(marginX, marginY, 0, 0);
_imgActualMargin = ImageMargin;
BorderSmallShowSwitch(); BorderSmallShowSwitch();
_imgSmallMouseDownPoint = Mouse.GetPosition(_canvasSmallImg);
_imgSmallMouseDownMargin = _borderMove.Margin;
MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
} }
protected override void OnMouseDoubleClick(MouseButtonEventArgs e) protected override void OnMouseDoubleClick(MouseButtonEventArgs e)
@@ -898,6 +878,14 @@ namespace HandyControl.Controls
var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y; var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
var marginX = _imgSmallMouseDownMargin.Left + subX; var marginX = _imgSmallMouseDownMargin.Left + subX;
var marginY = _imgSmallMouseDownMargin.Top + subY;
MoveSmallImg(marginX, marginY);
}
}
private void MoveSmallImg(double marginX, double marginY)
{
if (marginX < 0) if (marginX < 0)
{ {
marginX = 0; marginX = 0;
@@ -906,8 +894,6 @@ namespace HandyControl.Controls
{ {
marginX = _canvasSmallImg.ActualWidth - _borderMove.Width; marginX = _canvasSmallImg.ActualWidth - _borderMove.Width;
} }
var marginY = _imgSmallMouseDownMargin.Top + subY;
if (marginY < 0) if (marginY < 0)
{ {
marginY = 0; marginY = 0;
@@ -933,7 +919,6 @@ namespace HandyControl.Controls
ImageMargin = new Thickness(marginActualX, marginActualY, 0, 0); ImageMargin = new Thickness(marginActualX, marginActualY, 0, 0);
_imgActualMargin = ImageMargin; _imgActualMargin = ImageMargin;
} }
}
private void CanvasSmallImg_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void CanvasSmallImg_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{ {