github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 14:24:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert formatting changes

Browse source
This commit is contained in:
Julien Richard 2022-01-14 17:22:49 +01:00
commit f57691e5f3
1 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/Greenshot.Editor/Forms/ImageEditorForm.cs
View file

@ -332,7 +332,7 @@ namespace Greenshot.Editor.Forms
/// </summary> /// </summary>
private void AddDestinations() private void AddDestinations()
{ {
Invoke((MethodInvoker)delegate Invoke((MethodInvoker) delegate
{ {
// Create export buttons // Create export buttons
foreach (IDestination destination in DestinationHelper.GetAllDestinations()) foreach (IDestination destination in DestinationHelper.GetAllDestinations())
@ -625,7 +625,7 @@ namespace Greenshot.Editor.Forms
private void BtnPrintClick(object sender, EventArgs e) private void BtnPrintClick(object sender, EventArgs e)
{ {
// The BeginInvoke is a solution for the printdialog not having focus // The BeginInvoke is a solution for the printdialog not having focus
BeginInvoke((MethodInvoker)delegate { DestinationHelper.ExportCapture(true, WellKnownDestinations.Printer, _surface, _surface.CaptureDetails); }); BeginInvoke((MethodInvoker) delegate { DestinationHelper.ExportCapture(true, WellKnownDestinations.Printer, _surface, _surface.CaptureDetails); });
} }
private void CloseToolStripMenuItemClick(object sender, EventArgs e) private void CloseToolStripMenuItemClick(object sender, EventArgs e)
@ -1212,7 +1212,7 @@ namespace Greenshot.Editor.Forms
private void StatusLabelClicked(object sender, MouseEventArgs e) private void StatusLabelClicked(object sender, MouseEventArgs e)
{ {
ToolStrip ss = (StatusStrip)((ToolStripStatusLabel)sender).Owner; ToolStrip ss = (StatusStrip) ((ToolStripStatusLabel) sender).Owner;
ss.ContextMenuStrip?.Show(ss, e.X, e.Y); ss.ContextMenuStrip?.Show(ss, e.X, e.Y);
} }
@ -1284,9 +1284,9 @@ namespace Greenshot.Editor.Forms
textVerticalAlignmentButton.Visible = props.HasFieldValue(FieldType.TEXT_VERTICAL_ALIGNMENT); textVerticalAlignmentButton.Visible = props.HasFieldValue(FieldType.TEXT_VERTICAL_ALIGNMENT);
shadowButton.Visible = props.HasFieldValue(FieldType.SHADOW); shadowButton.Visible = props.HasFieldValue(FieldType.SHADOW);
counterLabel.Visible = counterUpDown.Visible = props.HasFieldValue(FieldType.FLAGS) counterLabel.Visible = counterUpDown.Visible = props.HasFieldValue(FieldType.FLAGS)
&& ((FieldFlag)props.GetFieldValue(FieldType.FLAGS) & FieldFlag.COUNTER) == FieldFlag.COUNTER; && ((FieldFlag) props.GetFieldValue(FieldType.FLAGS) & FieldFlag.COUNTER) == FieldFlag.COUNTER;
btnConfirm.Visible = btnCancel.Visible = props.HasFieldValue(FieldType.FLAGS) btnConfirm.Visible = btnCancel.Visible = props.HasFieldValue(FieldType.FLAGS)
&& ((FieldFlag)props.GetFieldValue(FieldType.FLAGS) & FieldFlag.CONFIRMABLE) == FieldFlag.CONFIRMABLE; && ((FieldFlag) props.GetFieldValue(FieldType.FLAGS) & FieldFlag.CONFIRMABLE) == FieldFlag.CONFIRMABLE;
obfuscateModeButton.Visible = props.HasFieldValue(FieldType.PREPARED_FILTER_OBFUSCATE); obfuscateModeButton.Visible = props.HasFieldValue(FieldType.PREPARED_FILTER_OBFUSCATE);
highlightModeButton.Visible = props.HasFieldValue(FieldType.PREPARED_FILTER_HIGHLIGHT); highlightModeButton.Visible = props.HasFieldValue(FieldType.PREPARED_FILTER_HIGHLIGHT);
@ -1316,11 +1316,11 @@ namespace Greenshot.Editor.Forms
Image icon; Image icon;
if (stepLabels <= 20) if (stepLabels <= 20)
{ {
icon = (Image)resources.GetObject($"btnStepLabel{stepLabels:00}.Image"); icon = (Image) resources.GetObject($"btnStepLabel{stepLabels:00}.Image");
} }
else else
{ {
icon = (Image)resources.GetObject("btnStepLabel20+.Image"); icon = (Image) resources.GetObject("btnStepLabel20+.Image");
} }
btnStepLabel.Image = icon; btnStepLabel.Image = icon;
@ -1329,7 +1329,7 @@ namespace Greenshot.Editor.Forms
FieldAggregator props = _surface.FieldAggregator; FieldAggregator props = _surface.FieldAggregator;
// if a confirmable element is selected, we must disable most of the controls // if a confirmable element is selected, we must disable most of the controls
// since we demand confirmation or cancel for confirmable element // since we demand confirmation or cancel for confirmable element
if (props.HasFieldValue(FieldType.FLAGS) && ((FieldFlag)props.GetFieldValue(FieldType.FLAGS) & FieldFlag.CONFIRMABLE) == FieldFlag.CONFIRMABLE) if (props.HasFieldValue(FieldType.FLAGS) && ((FieldFlag) props.GetFieldValue(FieldType.FLAGS) & FieldFlag.CONFIRMABLE) == FieldFlag.CONFIRMABLE)
{ {
// disable most controls // disable most controls
if (!_controlsDisabledDueToConfirmable) if (!_controlsDisabledDueToConfirmable)
@ -1377,7 +1377,7 @@ namespace Greenshot.Editor.Forms
private void ArrowHeadsToolStripMenuItemClick(object sender, EventArgs e) private void ArrowHeadsToolStripMenuItemClick(object sender, EventArgs e)
{ {
_surface.FieldAggregator.GetField(FieldType.ARROWHEADS).Value = (ArrowContainer.ArrowHeadCombination)((ToolStripMenuItem)sender).Tag; _surface.FieldAggregator.GetField(FieldType.ARROWHEADS).Value = (ArrowContainer.ArrowHeadCombination) ((ToolStripMenuItem) sender).Tag;
} }
private void EditToolStripMenuItemClick(object sender, EventArgs e) private void EditToolStripMenuItemClick(object sender, EventArgs e)
@ -1520,14 +1520,14 @@ namespace Greenshot.Editor.Forms
return; return;
} }
clickedDestination = (IDestination)clickedControl.Tag; clickedDestination = (IDestination) clickedControl.Tag;
} }
else else
{ {
if (sender is ToolStripMenuItem item) if (sender is ToolStripMenuItem item)
{ {
ToolStripMenuItem clickedMenuItem = item; ToolStripMenuItem clickedMenuItem = item;
clickedDestination = (IDestination)clickedMenuItem.Tag; clickedDestination = (IDestination) clickedMenuItem.Tag;
} }
} }
@ -1564,17 +1564,17 @@ namespace Greenshot.Editor.Forms
private void Insert_window_toolstripmenuitemMouseEnter(object sender, EventArgs e) private void Insert_window_toolstripmenuitemMouseEnter(object sender, EventArgs e)
{ {
ToolStripMenuItem captureWindowMenuItem = (ToolStripMenuItem)sender; ToolStripMenuItem captureWindowMenuItem = (ToolStripMenuItem) sender;
var mainForm = SimpleServiceProvider.Current.GetInstance<IGreenshotMainForm>(); var mainForm = SimpleServiceProvider.Current.GetInstance<IGreenshotMainForm>();
mainForm.AddCaptureWindowMenuItems(captureWindowMenuItem, Contextmenu_window_Click); mainForm.AddCaptureWindowMenuItems(captureWindowMenuItem, Contextmenu_window_Click);
} }
private void Contextmenu_window_Click(object sender, EventArgs e) private void Contextmenu_window_Click(object sender, EventArgs e)
{ {
ToolStripMenuItem clickedItem = (ToolStripMenuItem)sender; ToolStripMenuItem clickedItem = (ToolStripMenuItem) sender;
try try
{ {
WindowDetails windowToCapture = (WindowDetails)clickedItem.Tag; WindowDetails windowToCapture = (WindowDetails) clickedItem.Tag;
ICapture capture = new Capture(); ICapture capture = new Capture();
using (Graphics graphics = Graphics.FromHwnd(Handle)) using (Graphics graphics = Graphics.FromHwnd(Handle))
{ {
@ -1589,8 +1589,8 @@ namespace Greenshot.Editor.Forms
capture = captureHelper.CaptureWindow(windowToCapture, capture, coreConfiguration.WindowCaptureMode); capture = captureHelper.CaptureWindow(windowToCapture, capture, coreConfiguration.WindowCaptureMode);
if (capture?.CaptureDetails != null && capture.Image != null) if (capture?.CaptureDetails != null && capture.Image != null)
{ {
((Bitmap)capture.Image).SetResolution(capture.CaptureDetails.DpiX, capture.CaptureDetails.DpiY); ((Bitmap) capture.Image).SetResolution(capture.CaptureDetails.DpiX, capture.CaptureDetails.DpiY);
_surface.AddImageContainer((Bitmap)capture.Image, 100, 100); _surface.AddImageContainer((Bitmap) capture.Image, 100, 100);
} }
Activate(); Activate();
@ -1770,7 +1770,7 @@ namespace Greenshot.Editor.Forms
var canvas = Surface as Control; var canvas = Surface as Control;
Size canvasSize = canvas.Size; Size canvasSize = canvas.Size;
Size currentClientSize = panel1.ClientSize; Size currentClientSize = panel1.ClientSize;
Panel panel = (Panel)canvas?.Parent; Panel panel = (Panel) canvas?.Parent;
if (panel == null) if (panel == null)
{ {
return; return;
@ -1863,8 +1863,8 @@ namespace Greenshot.Editor.Forms
private void ZoomSetValueMenuItemClick(object sender, EventArgs e) private void ZoomSetValueMenuItemClick(object sender, EventArgs e)
{ {
var senderMenuItem = (ToolStripMenuItem)sender; var senderMenuItem = (ToolStripMenuItem) sender;
var nextValue = Fraction.Parse((string)senderMenuItem.Tag); var nextValue = Fraction.Parse((string) senderMenuItem.Tag);
ZoomSetValue(nextValue); ZoomSetValue(nextValue);
} }
@ -1877,7 +1877,7 @@ namespace Greenshot.Editor.Forms
var imageSize = Surface.Image.Size; var imageSize = Surface.Image.Size;
static bool isFit(Fraction scale, int source, int boundary) static bool isFit(Fraction scale, int source, int boundary)
=> (int)(source * scale) <= boundary; => (int) (source * scale) <= boundary;
var nextIndex = Array.FindLastIndex( var nextIndex = Array.FindLastIndex(
ZOOM_VALUES, ZOOM_VALUES,
@ -1939,7 +1939,7 @@ namespace Greenshot.Editor.Forms
AlignCanvasPositionAfterResize(); AlignCanvasPositionAfterResize();
// Update zoom controls // Update zoom controls
zoomStatusDropDownBtn.Text = ((int)(100 * (double)value)).ToString() + "%"; zoomStatusDropDownBtn.Text = ((int) (100 * (double) value)).ToString() + "%";
var valueString = value.ToString(); var valueString = value.ToString();
foreach (var item in zoomMenuStrip.Items) foreach (var item in zoomMenuStrip.Items)
{ {
@ -1953,8 +1953,8 @@ namespace Greenshot.Editor.Forms
rc = surface.GetVisibleRectangle(); rc = surface.GetVisibleRectangle();
size = surface.Size; size = surface.Size;
panel.AutoScrollPosition = new Point( panel.AutoScrollPosition = new Point(
(int)(horizontalCenter * size.Width) - rc.Width / 2, (int) (horizontalCenter * size.Width) - rc.Width / 2,
(int)(verticalCenter * size.Height) - rc.Height / 2 (int) (verticalCenter * size.Height) - rc.Height / 2
); );
} }
} }