chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update HandyControl/Controls/Window/ImageBrowser.cs

Browse Source
This commit is contained in:
NaBian committed 2018-11-11 23:02:12 +08:00
1 parent 37c9f3e3af
commit e7fe4de812
1 file changed
+19 -2
Download Patch File Download Diff File Expand all files Collapse all files
HandyControl/Controls/Window/ImageBrowser.cs
+19 -2
View File
@@ -292,6 +292,11 @@ namespace HandyControl.Controls
_gridTop.MouseLeftButtonDown -= GridTop_OnMouseLeftButtonDown;
}
if (_gridMain != null)
{
_gridMain.MouseLeftButtonDown -= GridMain_OnMouseLeftButtonDown;
}
if (_canvasSmallImg != null)
{
_canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
@@ -319,6 +324,11 @@ namespace HandyControl.Controls
_gridTop.MouseLeftButtonDown += GridTop_OnMouseLeftButtonDown;
}
if (_gridMain != null)
{
_gridMain.MouseLeftButtonDown += GridMain_OnMouseLeftButtonDown;
}
if (_canvasSmallImg != null)
{
_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)
{
base.OnMouseMove(e);
@@ -633,7 +651,7 @@ namespace HandyControl.Controls
private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (!(ImageWidth > ActualWidth || ImageHeight > ActualHeight))
if (e.LeftButton == MouseButtonState.Pressed && !(ImageWidth > ActualWidth || ImageHeight > ActualHeight))
{
DragMove();
return;
@@ -641,7 +659,6 @@ namespace HandyControl.Controls
_imgMouseDownPoint = Mouse.GetPosition(_gridMain);
_imgMouseDownMargin = ImageMargin;
_imgIsMouseLeftButtonDown = true;
//e.Handled = true;
}
protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)