Update HandyControl/Controls/Window/ImageBrowser.cs
This commit is contained in:
1 parent
37c9f3e3af
commit
e7fe4de812
1 file changed
+19
-2
@@ -292,6 +292,11 @@ namespace HandyControl.Controls
|
|||||||
_gridTop.MouseLeftButtonDown -= GridTop_OnMouseLeftButtonDown;
|
_gridTop.MouseLeftButtonDown -= GridTop_OnMouseLeftButtonDown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_gridMain != null)
|
||||||
|
{
|
||||||
|
_gridMain.MouseLeftButtonDown -= GridMain_OnMouseLeftButtonDown;
|
||||||
|
}
|
||||||
|
|
||||||
if (_canvasSmallImg != null)
|
if (_canvasSmallImg != null)
|
||||||
{
|
{
|
||||||
_canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
|
_canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
|
||||||
@@ -319,6 +324,11 @@ namespace HandyControl.Controls
|
|||||||
_gridTop.MouseLeftButtonDown += GridTop_OnMouseLeftButtonDown;
|
_gridTop.MouseLeftButtonDown += GridTop_OnMouseLeftButtonDown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_gridMain != null)
|
||||||
|
{
|
||||||
|
_gridMain.MouseLeftButtonDown += GridMain_OnMouseLeftButtonDown;
|
||||||
|
}
|
||||||
|
|
||||||
if (_canvasSmallImg != null)
|
if (_canvasSmallImg != null)
|
||||||
{
|
{
|
||||||
_canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
|
_canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
|
||||||
@@ -543,6 +553,14 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void GridMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.LeftButton == MouseButtonState.Pressed && !(ImageWidth > ActualWidth || ImageHeight > ActualHeight))
|
||||||
|
{
|
||||||
|
DragMove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected override void OnMouseMove(MouseEventArgs e)
|
protected override void OnMouseMove(MouseEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnMouseMove(e);
|
base.OnMouseMove(e);
|
||||||
@@ -633,7 +651,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
if (!(ImageWidth > ActualWidth || ImageHeight > ActualHeight))
|
if (e.LeftButton == MouseButtonState.Pressed && !(ImageWidth > ActualWidth || ImageHeight > ActualHeight))
|
||||||
{
|
{
|
||||||
DragMove();
|
DragMove();
|
||||||
return;
|
return;
|
||||||
@@ -641,7 +659,6 @@ namespace HandyControl.Controls
|
|||||||
_imgMouseDownPoint = Mouse.GetPosition(_gridMain);
|
_imgMouseDownPoint = Mouse.GetPosition(_gridMain);
|
||||||
_imgMouseDownMargin = ImageMargin;
|
_imgMouseDownMargin = ImageMargin;
|
||||||
_imgIsMouseLeftButtonDown = true;
|
_imgIsMouseLeftButtonDown = true;
|
||||||
//e.Handled = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
|
protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
|
||||||
|
|||||||
Reference in new issue
Block a user