|
@@ -104,11 +104,6 @@ namespace PicView.UI.TransformImage
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
|
|
|
- {
|
|
|
- Editing.Color_Picking.StopRunning(true);
|
|
|
- }
|
|
|
-
|
|
|
// Fix focus
|
|
|
EditTitleBar.Refocus();
|
|
|
|
|
@@ -185,6 +180,14 @@ namespace PicView.UI.TransformImage
|
|
|
AutoScrollTimer.Start();
|
|
|
}
|
|
|
|
|
|
+ if (Keyboard.Modifiers != ModifierKeys.Alt && UC.GetColorPicker != null)
|
|
|
+ {
|
|
|
+ if (UC.GetColorPicker.Opacity == 1)
|
|
|
+ {
|
|
|
+ Editing.Color_Picking.StartRunning();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// Don't drag when full scale
|
|
|
// and don't drag it if mouse not held down on image
|
|
|
if (!TheMainWindow.MainImage.IsMouseCaptured || scaleTransform.ScaleX == 1)
|