CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 13:10:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed right click menu from region capture and moved all buttons to toolbar

Browse source
This commit is contained in:
Jaex 2016-09-30 20:37:01 +03:00
parent a9eca34158
commit ca1d2b6e38
5 changed files with 113 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs generated
View file

@ -354,6 +354,16 @@ internal class Resources {
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap layer__pencil {
get {
object obj = ResourceManager.GetObject("layer__pencil", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary> /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap. /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary> /// </summary>

3
ShareX.ScreenCaptureLib/Properties/Resources.resx
View file

@ -486,4 +486,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="printer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\printer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="layer__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

BIN
ShareX.ScreenCaptureLib/Resources/layer--pencil.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 677 B

230
ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs
View file

@ -184,13 +184,12 @@ public bool NodesVisible
private RegionCaptureForm form; private RegionCaptureForm form;
private Form menuForm; private Form menuForm;
private ContextMenuStrip cmsContextMenu; private ToolStripEx tsMain;
private ToolStripSeparator tssObjectOptions, tssShapeOptions; private ToolStripSeparator tssObjectOptions, tssShapeOptions;
private ToolStripButton tsbDeleteSelected, tsbDeleteAll; private ToolStripButton tsbDeleteSelected, tsbDeleteAll;
private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop; private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize; private ToolStripLabeledNumericUpDown tslnudBorderSize, tslnudCornerRadius, tslnudBlurRadius, tslnudPixelateSize;
private bool isLeftPressed, isRightPressed, isUpPressed, isDownPressed, allowOptionsMenu; private bool isLeftPressed, isRightPressed, isUpPressed, isDownPressed;
private Stopwatch cmsCloseTimer;
public ShapeManager(RegionCaptureForm form) public ShapeManager(RegionCaptureForm form)
{ {
@ -217,11 +216,6 @@ public ShapeManager(RegionCaptureForm form)
form.KeyDown += form_KeyDown; form.KeyDown += form_KeyDown;
form.KeyUp += form_KeyUp; form.KeyUp += form_KeyUp;
if (form.IsAnnotationMode)
{
CreateContextMenu();
}
CurrentShape = null; CurrentShape = null;
if (form.Mode == RegionCaptureMode.Annotation) if (form.Mode == RegionCaptureMode.Annotation)
@ -240,7 +234,10 @@ public ShapeManager(RegionCaptureForm form)
private void form_Shown(object sender, EventArgs e) private void form_Shown(object sender, EventArgs e)
{ {
CreateMenu(); if (form.IsAnnotationMode)
{
CreateMenu();
}
} }
private void CreateMenu() private void CreateMenu()
@ -253,26 +250,29 @@ private void CreateMenu()
AutoSizeMode = AutoSizeMode.GrowAndShrink, AutoSizeMode = AutoSizeMode.GrowAndShrink,
ClientSize = new Size(759, 509), ClientSize = new Size(759, 509),
FormBorderStyle = FormBorderStyle.None, FormBorderStyle = FormBorderStyle.None,
Location = new Point(100, 100), Location = new Point(200, 200),
ShowInTaskbar = false, ShowInTaskbar = false,
StartPosition = FormStartPosition.Manual,
Text = "RegionCaptureFormMenu" Text = "RegionCaptureFormMenu"
}; };
menuForm.SuspendLayout(); menuForm.SuspendLayout();
ToolStripEx tsMain = new ToolStripEx() tsMain = new ToolStripEx()
{ {
AutoSize = false, AutoSize = true,
CanOverflow = false, CanOverflow = false,
ClickThrough = true, ClickThrough = true,
Dock = DockStyle.None, Dock = DockStyle.None,
Location = new Point(0, 0), Location = new Point(0, 0),
MinimumSize = new Size(100, 30),
Padding = new Padding(0, 0, 0, 0), Padding = new Padding(0, 0, 0, 0),
Size = new Size(552, 30),
TabIndex = 0, TabIndex = 0,
Text = "ToolStrip" Text = "ToolStrip"
}; };
tsMain.SuspendLayout();
menuForm.Controls.Add(tsMain); menuForm.Controls.Add(tsMain);
#region Editor mode #region Editor mode
@ -447,91 +447,15 @@ private void CreateMenu()
#endregion Selected object #endregion Selected object
#region Capture
if (form.Mode != RegionCaptureMode.Editor)
{
tsMain.Items.Add(new ToolStripSeparator());
ToolStripButton tsbFullscreenCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
tsbFullscreenCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbFullscreenCapture.Image = Resources.layer_fullscreen;
tsbFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
tsMain.Items.Add(tsbFullscreenCapture);
ToolStripButton tsbActiveMonitorCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
tsbActiveMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbActiveMonitorCapture.Image = Resources.monitor;
tsbActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
tsMain.Items.Add(tsbActiveMonitorCapture);
ToolStripDropDownButton tsbMonitorCapture = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Capture_monitor);
tsbMonitorCapture.HideImageMargin();
tsbMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbMonitorCapture.Image = Resources.monitor_window;
tsMain.Items.Add(tsbMonitorCapture);
tsbMonitorCapture.DropDownItems.Clear();
Screen[] screens = Screen.AllScreens;
for (int i = 0; i < screens.Length; i++)
{
Screen screen = screens[i];
ToolStripMenuItem tsmi = new ToolStripMenuItem(string.Format("{0}. {1}x{2}", i + 1, screen.Bounds.Width, screen.Bounds.Height));
int index = i;
tsmi.MouseDown += (sender, e) =>
{
form.MonitorIndex = index;
form.Close(RegionResult.Monitor);
};
tsbMonitorCapture.DropDownItems.Add(tsmi);
}
}
#endregion Capture
menuForm.ResumeLayout(false);
menuForm.Show(form);
UpdateContextMenu();
}
private void CreateContextMenu()
{
cmsContextMenu = new ContextMenuStrip(form.components);
cmsContextMenu.Renderer = new ToolStripCheckedBoldRenderer();
cmsContextMenu.IgnoreSeparatorClick();
cmsContextMenu.PreviewKeyDown += (sender, e) =>
{
if (e.KeyCode == Keys.Escape)
{
e.IsInputKey = true;
}
};
cmsContextMenu.KeyUp += (sender, e) =>
{
if (e.KeyCode == Keys.Escape)
{
cmsContextMenu.Close();
}
};
cmsContextMenu.Closed += (sender, e) =>
{
if (e.CloseReason == ToolStripDropDownCloseReason.AppClicked)
{
cmsCloseTimer = Stopwatch.StartNew();
}
};
#region Shape options #region Shape options
tssShapeOptions = new ToolStripSeparator(); tssShapeOptions = new ToolStripSeparator();
cmsContextMenu.Items.Add(tssShapeOptions); tsMain.Items.Add(tssShapeOptions);
ToolStripDropDownButton tsddbShapeOptions = new ToolStripDropDownButton("Shape options");
tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbShapeOptions.Image = Resources.layer__pencil;
tsMain.Items.Add(tsddbShapeOptions);
tsmiBorderColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Border_color___); tsmiBorderColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Border_color___);
tsmiBorderColor.Click += (sender, e) => tsmiBorderColor.Click += (sender, e) =>
@ -580,7 +504,7 @@ private void CreateContextMenu()
ResumeForm(); ResumeForm();
}; };
cmsContextMenu.Items.Add(tsmiBorderColor); tsddbShapeOptions.DropDownItems.Add(tsmiBorderColor);
tslnudBorderSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Border_size_); tslnudBorderSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Border_size_);
tslnudBorderSize.Content.Minimum = 0; tslnudBorderSize.Content.Minimum = 0;
@ -607,7 +531,7 @@ private void CreateContextMenu()
UpdateCurrentShape(); UpdateCurrentShape();
UpdateCursor(); UpdateCursor();
}; };
cmsContextMenu.Items.Add(tslnudBorderSize); tsddbShapeOptions.DropDownItems.Add(tslnudBorderSize);
tsmiFillColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Fill_color___); tsmiFillColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Fill_color___);
tsmiFillColor.Click += (sender, e) => tsmiFillColor.Click += (sender, e) =>
@ -655,7 +579,7 @@ private void CreateContextMenu()
ResumeForm(); ResumeForm();
}; };
cmsContextMenu.Items.Add(tsmiFillColor); tsddbShapeOptions.DropDownItems.Add(tsmiFillColor);
tslnudCornerRadius = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Corner_radius_); tslnudCornerRadius = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Corner_radius_);
tslnudCornerRadius.Content.Minimum = 0; tslnudCornerRadius.Content.Minimum = 0;
@ -676,7 +600,7 @@ private void CreateContextMenu()
UpdateCurrentShape(); UpdateCurrentShape();
}; };
cmsContextMenu.Items.Add(tslnudCornerRadius); tsddbShapeOptions.DropDownItems.Add(tslnudCornerRadius);
tslnudBlurRadius = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Blur_radius_); tslnudBlurRadius = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Blur_radius_);
tslnudBlurRadius.Content.Minimum = 2; tslnudBlurRadius.Content.Minimum = 2;
@ -686,7 +610,7 @@ private void CreateContextMenu()
AnnotationOptions.BlurRadius = (int)tslnudBlurRadius.Content.Value; AnnotationOptions.BlurRadius = (int)tslnudBlurRadius.Content.Value;
UpdateCurrentShape(); UpdateCurrentShape();
}; };
cmsContextMenu.Items.Add(tslnudBlurRadius); tsddbShapeOptions.DropDownItems.Add(tslnudBlurRadius);
tslnudPixelateSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Pixel_size_); tslnudPixelateSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Pixel_size_);
tslnudPixelateSize.Content.Minimum = 2; tslnudPixelateSize.Content.Minimum = 2;
@ -696,7 +620,7 @@ private void CreateContextMenu()
AnnotationOptions.PixelateSize = (int)tslnudPixelateSize.Content.Value; AnnotationOptions.PixelateSize = (int)tslnudPixelateSize.Content.Value;
UpdateCurrentShape(); UpdateCurrentShape();
}; };
cmsContextMenu.Items.Add(tslnudPixelateSize); tsddbShapeOptions.DropDownItems.Add(tslnudPixelateSize);
tsmiHighlightColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Highlight_color___); tsmiHighlightColor = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Highlight_color___);
tsmiHighlightColor.Click += (sender, e) => tsmiHighlightColor.Click += (sender, e) =>
@ -715,49 +639,94 @@ private void CreateContextMenu()
ResumeForm(); ResumeForm();
}; };
cmsContextMenu.Items.Add(tsmiHighlightColor); tsddbShapeOptions.DropDownItems.Add(tsmiHighlightColor);
#endregion Shape options #endregion Shape options
#region Capture
if (form.Mode != RegionCaptureMode.Editor)
{
tsMain.Items.Add(new ToolStripSeparator());
ToolStripButton tsbFullscreenCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_fullscreen);
tsbFullscreenCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbFullscreenCapture.Image = Resources.layer_fullscreen;
tsbFullscreenCapture.MouseDown += (sender, e) => form.Close(RegionResult.Fullscreen);
tsMain.Items.Add(tsbFullscreenCapture);
ToolStripButton tsbActiveMonitorCapture = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Capture_active_monitor);
tsbActiveMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbActiveMonitorCapture.Image = Resources.monitor;
tsbActiveMonitorCapture.MouseDown += (sender, e) => form.Close(RegionResult.ActiveMonitor);
tsMain.Items.Add(tsbActiveMonitorCapture);
ToolStripDropDownButton tsddbMonitorCapture = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Capture_monitor);
tsddbMonitorCapture.HideImageMargin();
tsddbMonitorCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbMonitorCapture.Image = Resources.monitor_window;
tsMain.Items.Add(tsddbMonitorCapture);
tsddbMonitorCapture.DropDownItems.Clear();
Screen[] screens = Screen.AllScreens;
for (int i = 0; i < screens.Length; i++)
{
Screen screen = screens[i];
ToolStripMenuItem tsmi = new ToolStripMenuItem(string.Format("{0}. {1}x{2}", i + 1, screen.Bounds.Width, screen.Bounds.Height));
int index = i;
tsmi.MouseDown += (sender, e) =>
{
form.MonitorIndex = index;
form.Close(RegionResult.Monitor);
};
tsddbMonitorCapture.DropDownItems.Add(tsmi);
}
}
#endregion Capture
#region Options #region Options
if (form.Mode != RegionCaptureMode.Editor) if (form.Mode != RegionCaptureMode.Editor)
{ {
cmsContextMenu.Items.Add(new ToolStripSeparator()); tsMain.Items.Add(new ToolStripSeparator());
ToolStripMenuItem tsmiOptions = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Options); ToolStripDropDownButton tsddbOptions = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Options);
tsmiOptions.Image = Resources.gear; tsddbOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
cmsContextMenu.Items.Add(tsmiOptions); tsddbOptions.Image = Resources.gear;
tsMain.Items.Add(tsddbOptions);
tsmiQuickCrop = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Multi_region_mode); tsmiQuickCrop = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Multi_region_mode);
tsmiQuickCrop.Checked = !Config.QuickCrop; tsmiQuickCrop.Checked = !Config.QuickCrop;
tsmiQuickCrop.CheckOnClick = true; tsmiQuickCrop.CheckOnClick = true;
tsmiQuickCrop.Click += (sender, e) => Config.QuickCrop = !tsmiQuickCrop.Checked; tsmiQuickCrop.Click += (sender, e) => Config.QuickCrop = !tsmiQuickCrop.Checked;
tsmiOptions.DropDownItems.Add(tsmiQuickCrop); tsddbOptions.DropDownItems.Add(tsmiQuickCrop);
ToolStripMenuItem tsmiTips = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_tips); ToolStripMenuItem tsmiTips = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_tips);
tsmiTips.Checked = Config.ShowTips; tsmiTips.Checked = Config.ShowTips;
tsmiTips.CheckOnClick = true; tsmiTips.CheckOnClick = true;
tsmiTips.Click += (sender, e) => Config.ShowTips = tsmiTips.Checked; tsmiTips.Click += (sender, e) => Config.ShowTips = tsmiTips.Checked;
tsmiOptions.DropDownItems.Add(tsmiTips); tsddbOptions.DropDownItems.Add(tsmiTips);
ToolStripMenuItem tsmiShowInfo = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_position_and_size_info); ToolStripMenuItem tsmiShowInfo = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_position_and_size_info);
tsmiShowInfo.Checked = Config.ShowInfo; tsmiShowInfo.Checked = Config.ShowInfo;
tsmiShowInfo.CheckOnClick = true; tsmiShowInfo.CheckOnClick = true;
tsmiShowInfo.Click += (sender, e) => Config.ShowInfo = tsmiShowInfo.Checked; tsmiShowInfo.Click += (sender, e) => Config.ShowInfo = tsmiShowInfo.Checked;
tsmiOptions.DropDownItems.Add(tsmiShowInfo); tsddbOptions.DropDownItems.Add(tsmiShowInfo);
ToolStripMenuItem tsmiShowMagnifier = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_magnifier); ToolStripMenuItem tsmiShowMagnifier = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_magnifier);
tsmiShowMagnifier.Checked = Config.ShowMagnifier; tsmiShowMagnifier.Checked = Config.ShowMagnifier;
tsmiShowMagnifier.CheckOnClick = true; tsmiShowMagnifier.CheckOnClick = true;
tsmiShowMagnifier.Click += (sender, e) => Config.ShowMagnifier = tsmiShowMagnifier.Checked; tsmiShowMagnifier.Click += (sender, e) => Config.ShowMagnifier = tsmiShowMagnifier.Checked;
tsmiOptions.DropDownItems.Add(tsmiShowMagnifier); tsddbOptions.DropDownItems.Add(tsmiShowMagnifier);
ToolStripMenuItem tsmiUseSquareMagnifier = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Square_shape_magnifier); ToolStripMenuItem tsmiUseSquareMagnifier = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Square_shape_magnifier);
tsmiUseSquareMagnifier.Checked = Config.UseSquareMagnifier; tsmiUseSquareMagnifier.Checked = Config.UseSquareMagnifier;
tsmiUseSquareMagnifier.CheckOnClick = true; tsmiUseSquareMagnifier.CheckOnClick = true;
tsmiUseSquareMagnifier.Click += (sender, e) => Config.UseSquareMagnifier = tsmiUseSquareMagnifier.Checked; tsmiUseSquareMagnifier.Click += (sender, e) => Config.UseSquareMagnifier = tsmiUseSquareMagnifier.Checked;
tsmiOptions.DropDownItems.Add(tsmiUseSquareMagnifier); tsddbOptions.DropDownItems.Add(tsmiUseSquareMagnifier);
ToolStripLabeledNumericUpDown tslnudMagnifierPixelCount = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Magnifier_pixel_count_); ToolStripLabeledNumericUpDown tslnudMagnifierPixelCount = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Magnifier_pixel_count_);
tslnudMagnifierPixelCount.Content.Minimum = RegionCaptureOptions.MagnifierPixelCountMinimum; tslnudMagnifierPixelCount.Content.Minimum = RegionCaptureOptions.MagnifierPixelCountMinimum;
@ -765,26 +734,26 @@ private void CreateContextMenu()
tslnudMagnifierPixelCount.Content.Increment = 2; tslnudMagnifierPixelCount.Content.Increment = 2;
tslnudMagnifierPixelCount.Content.Value = Config.MagnifierPixelCount; tslnudMagnifierPixelCount.Content.Value = Config.MagnifierPixelCount;
tslnudMagnifierPixelCount.Content.ValueChanged = (sender, e) => Config.MagnifierPixelCount = (int)tslnudMagnifierPixelCount.Content.Value; tslnudMagnifierPixelCount.Content.ValueChanged = (sender, e) => Config.MagnifierPixelCount = (int)tslnudMagnifierPixelCount.Content.Value;
tsmiOptions.DropDownItems.Add(tslnudMagnifierPixelCount); tsddbOptions.DropDownItems.Add(tslnudMagnifierPixelCount);
ToolStripLabeledNumericUpDown tslnudMagnifierPixelSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Magnifier_pixel_size_); ToolStripLabeledNumericUpDown tslnudMagnifierPixelSize = new ToolStripLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Magnifier_pixel_size_);
tslnudMagnifierPixelSize.Content.Minimum = RegionCaptureOptions.MagnifierPixelSizeMinimum; tslnudMagnifierPixelSize.Content.Minimum = RegionCaptureOptions.MagnifierPixelSizeMinimum;
tslnudMagnifierPixelSize.Content.Maximum = RegionCaptureOptions.MagnifierPixelSizeMaximum; tslnudMagnifierPixelSize.Content.Maximum = RegionCaptureOptions.MagnifierPixelSizeMaximum;
tslnudMagnifierPixelSize.Content.Value = Config.MagnifierPixelSize; tslnudMagnifierPixelSize.Content.Value = Config.MagnifierPixelSize;
tslnudMagnifierPixelSize.Content.ValueChanged = (sender, e) => Config.MagnifierPixelSize = (int)tslnudMagnifierPixelSize.Content.Value; tslnudMagnifierPixelSize.Content.ValueChanged = (sender, e) => Config.MagnifierPixelSize = (int)tslnudMagnifierPixelSize.Content.Value;
tsmiOptions.DropDownItems.Add(tslnudMagnifierPixelSize); tsddbOptions.DropDownItems.Add(tslnudMagnifierPixelSize);
ToolStripMenuItem tsmiShowCrosshair = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_screen_wide_crosshair); ToolStripMenuItem tsmiShowCrosshair = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_screen_wide_crosshair);
tsmiShowCrosshair.Checked = Config.ShowCrosshair; tsmiShowCrosshair.Checked = Config.ShowCrosshair;
tsmiShowCrosshair.CheckOnClick = true; tsmiShowCrosshair.CheckOnClick = true;
tsmiShowCrosshair.Click += (sender, e) => Config.ShowCrosshair = tsmiShowCrosshair.Checked; tsmiShowCrosshair.Click += (sender, e) => Config.ShowCrosshair = tsmiShowCrosshair.Checked;
tsmiOptions.DropDownItems.Add(tsmiShowCrosshair); tsddbOptions.DropDownItems.Add(tsmiShowCrosshair);
ToolStripMenuItem tsmiFixedSize = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Fixed_size_region_mode); ToolStripMenuItem tsmiFixedSize = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Fixed_size_region_mode);
tsmiFixedSize.Checked = Config.IsFixedSize; tsmiFixedSize.Checked = Config.IsFixedSize;
tsmiFixedSize.CheckOnClick = true; tsmiFixedSize.CheckOnClick = true;
tsmiFixedSize.Click += (sender, e) => Config.IsFixedSize = tsmiFixedSize.Checked; tsmiFixedSize.Click += (sender, e) => Config.IsFixedSize = tsmiFixedSize.Checked;
tsmiOptions.DropDownItems.Add(tsmiFixedSize); tsddbOptions.DropDownItems.Add(tsmiFixedSize);
ToolStripDoubleLabeledNumericUpDown tslnudFixedSize = new ToolStripDoubleLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Width_, ToolStripDoubleLabeledNumericUpDown tslnudFixedSize = new ToolStripDoubleLabeledNumericUpDown(Resources.ShapeManager_CreateContextMenu_Width_,
Resources.ShapeManager_CreateContextMenu_Height_); Resources.ShapeManager_CreateContextMenu_Height_);
@ -794,17 +763,25 @@ private void CreateContextMenu()
tslnudFixedSize.Content.Value = Config.FixedSize.Width; tslnudFixedSize.Content.Value = Config.FixedSize.Width;
tslnudFixedSize.Content.Value2 = Config.FixedSize.Height; tslnudFixedSize.Content.Value2 = Config.FixedSize.Height;
tslnudFixedSize.Content.ValueChanged = (sender, e) => Config.FixedSize = new Size((int)tslnudFixedSize.Content.Value, (int)tslnudFixedSize.Content.Value2); tslnudFixedSize.Content.ValueChanged = (sender, e) => Config.FixedSize = new Size((int)tslnudFixedSize.Content.Value, (int)tslnudFixedSize.Content.Value2);
tsmiOptions.DropDownItems.Add(tslnudFixedSize); tsddbOptions.DropDownItems.Add(tslnudFixedSize);
ToolStripMenuItem tsmiShowFPS = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_FPS); ToolStripMenuItem tsmiShowFPS = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_Show_FPS);
tsmiShowFPS.Checked = Config.ShowFPS; tsmiShowFPS.Checked = Config.ShowFPS;
tsmiShowFPS.CheckOnClick = true; tsmiShowFPS.CheckOnClick = true;
tsmiShowFPS.Click += (sender, e) => Config.ShowFPS = tsmiShowFPS.Checked; tsmiShowFPS.Click += (sender, e) => Config.ShowFPS = tsmiShowFPS.Checked;
tsmiOptions.DropDownItems.Add(tsmiShowFPS); tsddbOptions.DropDownItems.Add(tsmiShowFPS);
} }
#endregion Options #endregion Options
tsMain.ResumeLayout(false);
tsMain.PerformLayout();
menuForm.ResumeLayout(false);
menuForm.Show(form);
UpdateContextMenu();
CurrentShapeTypeChanged += shapeType => UpdateContextMenu(); CurrentShapeTypeChanged += shapeType => UpdateContextMenu();
CurrentShapeChanged += shape => UpdateContextMenu(); CurrentShapeChanged += shape => UpdateContextMenu();
@ -819,11 +796,11 @@ private void UpdateContextMenu()
tssObjectOptions.Visible = tsbDeleteAll.Visible = Shapes.Count > 0; tssObjectOptions.Visible = tsbDeleteAll.Visible = Shapes.Count > 0;
tsbDeleteSelected.Visible = CurrentShape != null; tsbDeleteSelected.Visible = CurrentShape != null;
foreach (ToolStripMenuItem tsmi in cmsContextMenu.Items.OfType<ToolStripMenuItem>().Where(x => x.Tag is ShapeType)) foreach (ToolStripButton tsb in tsMain.Items.OfType<ToolStripButton>().Where(x => x.Tag is ShapeType))
{ {
if ((ShapeType)tsmi.Tag == shapeType) if ((ShapeType)tsb.Tag == shapeType)
{ {
tsmi.RadioCheck(); tsb.RadioCheck();
break; break;
} }
} }
@ -982,8 +959,6 @@ private void form_LostFocus(object sender, EventArgs e)
private void form_MouseDown(object sender, MouseEventArgs e) private void form_MouseDown(object sender, MouseEventArgs e)
{ {
allowOptionsMenu = cmsCloseTimer == null || cmsCloseTimer.ElapsedMilliseconds > 100;
if (e.Button == MouseButtons.Left) if (e.Button == MouseButtons.Left)
{ {
if (!IsCreating) if (!IsCreating)
@ -1315,10 +1290,7 @@ private void RunAction(RegionCaptureAction action)
DeleteIntersectShape(); DeleteIntersectShape();
break; break;
case RegionCaptureAction.OpenOptionsMenu: case RegionCaptureAction.OpenOptionsMenu:
if (allowOptionsMenu) OpenOptionsMenu();
{
OpenOptionsMenu();
}
break; break;
case RegionCaptureAction.SwapToolType: case RegionCaptureAction.SwapToolType:
SwapShapeType(); SwapShapeType();
@ -1534,11 +1506,7 @@ private void OpenOptionsMenu()
{ {
SelectIntersectShape(); SelectIntersectShape();
if (form.IsAnnotationMode && cmsContextMenu != null) Config.ShowMenuTip = false;
{
cmsContextMenu.Show(form, InputManager.MousePosition0Based.Add(-10, -10));
Config.ShowMenuTip = false;
}
} }
public Point SnapPosition(Point posOnClick, Point posCurrent) public Point SnapPosition(Point posOnClick, Point posCurrent)

1
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View file

@ -170,6 +170,7 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\layer--pencil.png" />
<None Include="Resources\printer.png" /> <None Include="Resources\printer.png" />
<None Include="Resources\drive-globe.png" /> <None Include="Resources\drive-globe.png" />
<None Include="Resources\disks-black.png" /> <None Include="Resources\disks-black.png" />