Update ScreenCut.cs

yanjinhuagood · yanjinhuagood · commit fdb2bbeb354a · 2023-08-16T22:47:23.000+08:00
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -216,33 +216,33 @@ public override void OnApplyTemplate()
             _rectangleRight = GetTemplateChild(RectangleRightTemplateName) as Rectangle;
             _rectangleBottom = GetTemplateChild(RectangleBottomTemplateName) as Rectangle;
             _border = GetTemplateChild(BorderTemplateName) as Border;
-            _border.MouseLeftButtonDown += _border_MouseLeftButtonDown;
+            _border.MouseLeftButtonDown += Border_MouseLeftButtonDown;
 
             _editBar = GetTemplateChild(EditBarTemplateName) as Border;
             _buttonSave = GetTemplateChild(ButtonSaveTemplateName) as Button;
             if (_buttonSave != null)
-                _buttonSave.Click += _buttonSave_Click;
+                _buttonSave.Click += ButtonSave_Click;
             _buttonCancel = GetTemplateChild(ButtonCancelTemplateName) as Button;
             if (_buttonCancel != null)
-                _buttonCancel.Click += _buttonCancel_Click;
+                _buttonCancel.Click += ButtonCancel_Click;
             _buttonComplete = GetTemplateChild(ButtonCompleteTemplateName) as Button;
             if (_buttonComplete != null)
-                _buttonComplete.Click += _buttonComplete_Click;
+                _buttonComplete.Click += ButtonComplete_Click;
             _radioButtonRectangle = GetTemplateChild(RadioButtonRectangleTemplateName) as RadioButton;
             if (_radioButtonRectangle != null)
-                _radioButtonRectangle.Click += _radioButtonRectangle_Click;
+                _radioButtonRectangle.Click += RadioButtonRectangle_Click;
             _radioButtonEllipse = GetTemplateChild(RadioButtonEllipseTemplateName) as RadioButton;
             if (_radioButtonEllipse != null)
-                _radioButtonEllipse.Click += _radioButtonEllipse_Click;
+                _radioButtonEllipse.Click += RadioButtonEllipse_Click;
             _radioButtonArrow = GetTemplateChild(RadioButtonArrowTemplateName) as RadioButton;
             if (_radioButtonArrow != null)
-                _radioButtonArrow.Click += _radioButtonArrow_Click;
+                _radioButtonArrow.Click += RadioButtonArrow_Click;
             _radioButtonInk = GetTemplateChild(RadioButtonInkTemplateName) as RadioButton;
             if (_radioButtonInk != null)
-                _radioButtonInk.Click += _radioButtonInk_Click;
+                _radioButtonInk.Click += RadioButtonInk_Click;
             _radioButtonText = GetTemplateChild(RadioButtonTextTemplateName) as RadioButton;
             if (_radioButtonText != null)
-                _radioButtonText.Click += _radioButtonText_Click;
+                _radioButtonText.Click += RadioButtonText_Click;
             _canvas.Width = Screen.AllScreens[ScreenIndex].Bounds.Width;
             _canvas.Height = Screen.AllScreens[ScreenIndex].Bounds.Height;
             //_canvas.Background = new ImageBrush(ControlsHelper.Capture());
@@ -254,7 +254,7 @@ public override void OnApplyTemplate()
             _popupBorder = GetTemplateChild(PopupBorderTemplateName) as Border;
             _popupBorder.Loaded += (s, e) => { _popup.HorizontalOffset = -_popupBorder.ActualWidth / 3; };
             _wrapPanel = GetTemplateChild(WrapPanelColorTemplateName) as WrapPanel;
-            _wrapPanel.PreviewMouseDown += _wrapPanel_PreviewMouseDown;
+            _wrapPanel.PreviewMouseDown += WrapPanel_PreviewMouseDown;
             Loaded += ScreenCut_Loaded;
             controlTemplate = (ControlTemplate)FindResource("WD.PART_DrawArrow");
         }
@@ -322,22 +322,22 @@ protected override void OnPreviewMouseRightButtonDown(MouseButtonEventArgs e)
             OnCanceled();
         }
 
-        private void _radioButtonInk_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonInk_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonInk, ScreenCutMouseType.DrawInk);
         }
 
-        private void _radioButtonText_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonText_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonText, ScreenCutMouseType.DrawText);
         }
 
-        private void _radioButtonArrow_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonArrow_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonArrow, ScreenCutMouseType.DrawArrow);
         }
 
-        private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        private void WrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.Source is RadioButton)
             {
@@ -346,12 +346,12 @@ private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)
             }
         }
 
-        private void _radioButtonRectangle_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonRectangle_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonRectangle, ScreenCutMouseType.DrawRectangle);
         }
 
-        private void _radioButtonEllipse_Click(object sender, RoutedEventArgs e)
+        private void RadioButtonEllipse_Click(object sender, RoutedEventArgs e)
         {
             RadioButtonChecked(_radioButtonEllipse, ScreenCutMouseType.DrawEllipse);
         }
@@ -405,13 +405,13 @@ private void _border_SizeChanged(object sender, SizeChangedEventArgs e)
             EditBarPosition();
         }
         
-        private void _border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             if (screenCutMouseType == ScreenCutMouseType.Default)
                 screenCutMouseType = ScreenCutMouseType.MoveMouse;
         }
         
-        private void _buttonSave_Click(object sender, RoutedEventArgs e)
+        private void ButtonSave_Click(object sender, RoutedEventArgs e)
         {
             var dlg = new SaveFileDialog();
             dlg.FileName = $"WPFDevelopers{DateTime.Now.ToString("yyyyMMddHHmmss")}.jpg";
@@ -432,7 +432,7 @@ private void _buttonSave_Click(object sender, RoutedEventArgs e)
             }
         }
         
-        private void _buttonComplete_Click(object sender, RoutedEventArgs e)
+        private void ButtonComplete_Click(object sender, RoutedEventArgs e)
         {
             var bitmap = CutBitmap();
             if (CutCompleted != null)
@@ -455,7 +455,7 @@ private CroppedBitmap CutBitmap()
                 new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));
         }
         
-        private void _buttonCancel_Click(object sender, RoutedEventArgs e)
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
         {
             OnCanceled();
         }
@@ -593,7 +593,7 @@ private void DrawText()
                     textBorder.PreviewMouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonText.IsChecked = true;
-                        _radioButtonText_Click(null, null);
+                        RadioButtonText_Click(null, null);
                         SelectElement();
                         var border = s as Border;
                         frameworkElement = border;
@@ -679,7 +679,7 @@ private void DrwaInkControl(Point current)
                     polyLine.MouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonInk.IsChecked = true;
-                        _radioButtonInk_Click(null, null);
+                        RadioButtonInk_Click(null, null);
                         SelectElement();
                         frameworkElement = s as Polyline;
                         frameworkElement.Opacity = .7;
@@ -713,7 +713,7 @@ private void DrawArrowControl(Point current)
                 controlArrow.MouseLeftButtonDown += (s, e) =>
                 {
                     _radioButtonArrow.IsChecked = true;
-                    _radioButtonArrow_Click(null, null);
+                    RadioButtonArrow_Click(null, null);
                     SelectElement();
                     frameworkElement = s as Control;
                     frameworkElement.Opacity = .7;
@@ -841,7 +841,7 @@ private void DrawMultipleControl(Point current)
                         borderRectangle.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonRectangle.IsChecked = true;
-                            _radioButtonRectangle_Click(null, null);
+                            RadioButtonRectangle_Click(null, null);
                             SelectElement();
                             frameworkElement = s as Border;
                             frameworkElement.Opacity = .7;
@@ -863,7 +863,7 @@ private void DrawMultipleControl(Point current)
                         drawEllipse.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonEllipse.IsChecked = true;
-                            _radioButtonEllipse_Click(null, null);
+                            RadioButtonEllipse_Click(null, null);
                             SelectElement();
                             frameworkElement = s as Ellipse;
                             frameworkElement.Opacity = .7;

Original file line number	Diff line number	Diff line change
`@@ -216,33 +216,33 @@ public override void OnApplyTemplate()`
`216`	`216`	`_rectangleRight = GetTemplateChild(RectangleRightTemplateName) as Rectangle;`
`217`	`217`	`_rectangleBottom = GetTemplateChild(RectangleBottomTemplateName) as Rectangle;`
`218`	`218`	`_border = GetTemplateChild(BorderTemplateName) as Border;`
`219`		`- _border.MouseLeftButtonDown += _border_MouseLeftButtonDown;`
	`219`	`+ _border.MouseLeftButtonDown += Border_MouseLeftButtonDown;`
`220`	`220`
`221`	`221`	`_editBar = GetTemplateChild(EditBarTemplateName) as Border;`
`222`	`222`	`_buttonSave = GetTemplateChild(ButtonSaveTemplateName) as Button;`
`223`	`223`	`if (_buttonSave != null)`
`224`		`- _buttonSave.Click += _buttonSave_Click;`
	`224`	`+ _buttonSave.Click += ButtonSave_Click;`
`225`	`225`	`_buttonCancel = GetTemplateChild(ButtonCancelTemplateName) as Button;`
`226`	`226`	`if (_buttonCancel != null)`
`227`		`- _buttonCancel.Click += _buttonCancel_Click;`
	`227`	`+ _buttonCancel.Click += ButtonCancel_Click;`
`228`	`228`	`_buttonComplete = GetTemplateChild(ButtonCompleteTemplateName) as Button;`
`229`	`229`	`if (_buttonComplete != null)`
`230`		`- _buttonComplete.Click += _buttonComplete_Click;`
	`230`	`+ _buttonComplete.Click += ButtonComplete_Click;`
`231`	`231`	`_radioButtonRectangle = GetTemplateChild(RadioButtonRectangleTemplateName) as RadioButton;`
`232`	`232`	`if (_radioButtonRectangle != null)`
`233`		`- _radioButtonRectangle.Click += _radioButtonRectangle_Click;`
	`233`	`+ _radioButtonRectangle.Click += RadioButtonRectangle_Click;`
`234`	`234`	`_radioButtonEllipse = GetTemplateChild(RadioButtonEllipseTemplateName) as RadioButton;`
`235`	`235`	`if (_radioButtonEllipse != null)`
`236`		`- _radioButtonEllipse.Click += _radioButtonEllipse_Click;`
	`236`	`+ _radioButtonEllipse.Click += RadioButtonEllipse_Click;`
`237`	`237`	`_radioButtonArrow = GetTemplateChild(RadioButtonArrowTemplateName) as RadioButton;`
`238`	`238`	`if (_radioButtonArrow != null)`
`239`		`- _radioButtonArrow.Click += _radioButtonArrow_Click;`
	`239`	`+ _radioButtonArrow.Click += RadioButtonArrow_Click;`
`240`	`240`	`_radioButtonInk = GetTemplateChild(RadioButtonInkTemplateName) as RadioButton;`
`241`	`241`	`if (_radioButtonInk != null)`
`242`		`- _radioButtonInk.Click += _radioButtonInk_Click;`
	`242`	`+ _radioButtonInk.Click += RadioButtonInk_Click;`
`243`	`243`	`_radioButtonText = GetTemplateChild(RadioButtonTextTemplateName) as RadioButton;`
`244`	`244`	`if (_radioButtonText != null)`
`245`		`- _radioButtonText.Click += _radioButtonText_Click;`
	`245`	`+ _radioButtonText.Click += RadioButtonText_Click;`
`246`	`246`	`_canvas.Width = Screen.AllScreens[ScreenIndex].Bounds.Width;`
`247`	`247`	`_canvas.Height = Screen.AllScreens[ScreenIndex].Bounds.Height;`
`248`	`248`	`//_canvas.Background = new ImageBrush(ControlsHelper.Capture());`
`@@ -254,7 +254,7 @@ public override void OnApplyTemplate()`
`254`	`254`	`_popupBorder = GetTemplateChild(PopupBorderTemplateName) as Border;`
`255`	`255`	`_popupBorder.Loaded += (s, e) => { _popup.HorizontalOffset = -_popupBorder.ActualWidth / 3; };`
`256`	`256`	`_wrapPanel = GetTemplateChild(WrapPanelColorTemplateName) as WrapPanel;`
`257`		`- _wrapPanel.PreviewMouseDown += _wrapPanel_PreviewMouseDown;`
	`257`	`+ _wrapPanel.PreviewMouseDown += WrapPanel_PreviewMouseDown;`
`258`	`258`	`Loaded += ScreenCut_Loaded;`
`259`	`259`	`controlTemplate = (ControlTemplate)FindResource("WD.PART_DrawArrow");`
`260`	`260`	`}`
`@@ -322,22 +322,22 @@ protected override void OnPreviewMouseRightButtonDown(MouseButtonEventArgs e)`
`322`	`322`	`OnCanceled();`
`323`	`323`	`}`
`324`	`324`
`325`		`- private void _radioButtonInk_Click(object sender, RoutedEventArgs e)`
	`325`	`+ private void RadioButtonInk_Click(object sender, RoutedEventArgs e)`
`326`	`326`	`{`
`327`	`327`	`RadioButtonChecked(_radioButtonInk, ScreenCutMouseType.DrawInk);`
`328`	`328`	`}`
`329`	`329`
`330`		`- private void _radioButtonText_Click(object sender, RoutedEventArgs e)`
	`330`	`+ private void RadioButtonText_Click(object sender, RoutedEventArgs e)`
`331`	`331`	`{`
`332`	`332`	`RadioButtonChecked(_radioButtonText, ScreenCutMouseType.DrawText);`
`333`	`333`	`}`
`334`	`334`
`335`		`- private void _radioButtonArrow_Click(object sender, RoutedEventArgs e)`
	`335`	`+ private void RadioButtonArrow_Click(object sender, RoutedEventArgs e)`
`336`	`336`	`{`
`337`	`337`	`RadioButtonChecked(_radioButtonArrow, ScreenCutMouseType.DrawArrow);`
`338`	`338`	`}`
`339`	`339`
`340`		`- private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)`
	`340`	`+ private void WrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)`
`341`	`341`	`{`
`342`	`342`	`if (e.Source is RadioButton)`
`343`	`343`	`{`
`@@ -346,12 +346,12 @@ private void _wrapPanel_PreviewMouseDown(object sender, MouseButtonEventArgs e)`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
`349`		`- private void _radioButtonRectangle_Click(object sender, RoutedEventArgs e)`
	`349`	`+ private void RadioButtonRectangle_Click(object sender, RoutedEventArgs e)`
`350`	`350`	`{`
`351`	`351`	`RadioButtonChecked(_radioButtonRectangle, ScreenCutMouseType.DrawRectangle);`
`352`	`352`	`}`
`353`	`353`
`354`		`- private void _radioButtonEllipse_Click(object sender, RoutedEventArgs e)`
	`354`	`+ private void RadioButtonEllipse_Click(object sender, RoutedEventArgs e)`
`355`	`355`	`{`
`356`	`356`	`RadioButtonChecked(_radioButtonEllipse, ScreenCutMouseType.DrawEllipse);`
`357`	`357`	`}`
`@@ -405,13 +405,13 @@ private void _border_SizeChanged(object sender, SizeChangedEventArgs e)`
`405`	`405`	`EditBarPosition();`
`406`	`406`	`}`
`407`	`407`
`408`		`- private void _border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)`
	`408`	`+ private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)`
`409`	`409`	`{`
`410`	`410`	`if (screenCutMouseType == ScreenCutMouseType.Default)`
`411`	`411`	`screenCutMouseType = ScreenCutMouseType.MoveMouse;`
`412`	`412`	`}`
`413`	`413`
`414`		`- private void _buttonSave_Click(object sender, RoutedEventArgs e)`
	`414`	`+ private void ButtonSave_Click(object sender, RoutedEventArgs e)`
`415`	`415`	`{`
`416`	`416`	`var dlg = new SaveFileDialog();`
`417`	`417`	`dlg.FileName = $"WPFDevelopers{DateTime.Now.ToString("yyyyMMddHHmmss")}.jpg";`
`@@ -432,7 +432,7 @@ private void _buttonSave_Click(object sender, RoutedEventArgs e)`
`432`	`432`	`}`
`433`	`433`	`}`
`434`	`434`
`435`		`- private void _buttonComplete_Click(object sender, RoutedEventArgs e)`
	`435`	`+ private void ButtonComplete_Click(object sender, RoutedEventArgs e)`
`436`	`436`	`{`
`437`	`437`	`var bitmap = CutBitmap();`
`438`	`438`	`if (CutCompleted != null)`
`@@ -455,7 +455,7 @@ private CroppedBitmap CutBitmap()`
`455`	`455`	`new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));`
`456`	`456`	`}`
`457`	`457`
`458`		`- private void _buttonCancel_Click(object sender, RoutedEventArgs e)`
	`458`	`+ private void ButtonCancel_Click(object sender, RoutedEventArgs e)`
`459`	`459`	`{`
`460`	`460`	`OnCanceled();`
`461`	`461`	`}`
`@@ -593,7 +593,7 @@ private void DrawText()`
`593`	`593`	`textBorder.PreviewMouseLeftButtonDown += (s, e) =>`
`594`	`594`	`{`
`595`	`595`	`_radioButtonText.IsChecked = true;`
`596`		`- _radioButtonText_Click(null, null);`
	`596`	`+ RadioButtonText_Click(null, null);`
`597`	`597`	`SelectElement();`
`598`	`598`	`var border = s as Border;`
`599`	`599`	`frameworkElement = border;`
`@@ -679,7 +679,7 @@ private void DrwaInkControl(Point current)`
`679`	`679`	`polyLine.MouseLeftButtonDown += (s, e) =>`
`680`	`680`	`{`
`681`	`681`	`_radioButtonInk.IsChecked = true;`
`682`		`- _radioButtonInk_Click(null, null);`
	`682`	`+ RadioButtonInk_Click(null, null);`
`683`	`683`	`SelectElement();`
`684`	`684`	`frameworkElement = s as Polyline;`
`685`	`685`	`frameworkElement.Opacity = .7;`
`@@ -713,7 +713,7 @@ private void DrawArrowControl(Point current)`
`713`	`713`	`controlArrow.MouseLeftButtonDown += (s, e) =>`
`714`	`714`	`{`
`715`	`715`	`_radioButtonArrow.IsChecked = true;`
`716`		`- _radioButtonArrow_Click(null, null);`
	`716`	`+ RadioButtonArrow_Click(null, null);`
`717`	`717`	`SelectElement();`
`718`	`718`	`frameworkElement = s as Control;`
`719`	`719`	`frameworkElement.Opacity = .7;`
`@@ -841,7 +841,7 @@ private void DrawMultipleControl(Point current)`
`841`	`841`	`borderRectangle.MouseLeftButtonDown += (s, e) =>`
`842`	`842`	`{`
`843`	`843`	`_radioButtonRectangle.IsChecked = true;`
`844`		`- _radioButtonRectangle_Click(null, null);`
	`844`	`+ RadioButtonRectangle_Click(null, null);`
`845`	`845`	`SelectElement();`
`846`	`846`	`frameworkElement = s as Border;`
`847`	`847`	`frameworkElement.Opacity = .7;`
`@@ -863,7 +863,7 @@ private void DrawMultipleControl(Point current)`
`863`	`863`	`drawEllipse.MouseLeftButtonDown += (s, e) =>`
`864`	`864`	`{`
`865`	`865`	`_radioButtonEllipse.IsChecked = true;`
`866`		`- _radioButtonEllipse_Click(null, null);`
	`866`	`+ RadioButtonEllipse_Click(null, null);`
`867`	`867`	`SelectElement();`
`868`	`868`	`frameworkElement = s as Ellipse;`
`869`	`869`	`frameworkElement.Opacity = .7;`