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

Change Enabled of controls instead of Visible, so menu size won't change

Browse source
This commit is contained in:
Jaex 2016-10-01 10:51:11 +03:00
parent 3b9122b326
commit d3d8e2dd1c
5 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -253,9 +253,6 @@ X: {4} Y: {5}</value>
<data name="RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode" xml:space="preserve">
<value>[3] Select pen drawing mode</value>
</data>
<data name="minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -492,4 +489,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="ui_radio_button_uncheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-radio-button-uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX.ScreenCaptureLib/Resources/eraser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 656 B

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

@ -185,7 +185,6 @@ public bool NodesVisible
private RegionCaptureForm form;
private Form menuForm;
private ToolStripEx tsMain;
private ToolStripSeparator tssObjectActions, tssShapeOptions;
private ToolStripButton tsbDeleteSelected, tsbDeleteAll;
private ToolStripDropDownButton tsddbShapeOptions;
private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
@ -449,27 +448,7 @@ private void CreateMenu()
#region Selected object
tssObjectActions = new ToolStripSeparator();
tsMain.Items.Add(tssObjectActions);
tsbDeleteSelected = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_selected_object);
tsbDeleteSelected.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbDeleteSelected.Image = Resources.layer__minus;
tsbDeleteSelected.MouseDown += (sender, e) => DeleteCurrentShape();
tsMain.Items.Add(tsbDeleteSelected);
tsbDeleteAll = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_all_objects);
tsbDeleteAll.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbDeleteAll.Image = Resources.minus;
tsbDeleteAll.MouseDown += (sender, e) => DeleteAllShapes();
tsMain.Items.Add(tsbDeleteAll);
#endregion Selected object
#region Shape options
tssShapeOptions = new ToolStripSeparator();
tsMain.Items.Add(tssShapeOptions);
tsMain.Items.Add(new ToolStripSeparator());
tsddbShapeOptions = new ToolStripDropDownButton("Shape options");
tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
@ -660,7 +639,19 @@ private void CreateMenu()
};
tsddbShapeOptions.DropDownItems.Add(tsmiHighlightColor);
#endregion Shape options
tsbDeleteSelected = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_selected_object);
tsbDeleteSelected.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbDeleteSelected.Image = Resources.layer__minus;
tsbDeleteSelected.MouseDown += (sender, e) => DeleteCurrentShape();
tsMain.Items.Add(tsbDeleteSelected);
tsbDeleteAll = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Delete_all_objects);
tsbDeleteAll.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbDeleteAll.Image = Resources.eraser;
tsbDeleteAll.MouseDown += (sender, e) => DeleteAllShapes();
tsMain.Items.Add(tsbDeleteAll);
#endregion Selected object
#region Capture
@ -829,9 +820,6 @@ private void UpdateMenu()
ShapeType shapeType = CurrentShapeType;
tssObjectActions.Visible = tsbDeleteAll.Visible = Shapes.Count > 0;
tsbDeleteSelected.Visible = CurrentShape != null;
foreach (ToolStripButton tsb in tsMain.Items.OfType<ToolStripButton>().Where(x => x.Tag is ShapeType))
{
if ((ShapeType)tsb.Tag == shapeType)
@ -917,8 +905,7 @@ private void UpdateMenu()
switch (shapeType)
{
default:
tssShapeOptions.Visible = false;
tsddbShapeOptions.Visible = false;
tsddbShapeOptions.Enabled = false;
break;
case ShapeType.RegionRoundedRectangle:
case ShapeType.DrawingRectangle:
@ -933,11 +920,13 @@ private void UpdateMenu()
case ShapeType.EffectBlur:
case ShapeType.EffectPixelate:
case ShapeType.EffectHighlight:
tssShapeOptions.Visible = true;
tsddbShapeOptions.Visible = true;
tsddbShapeOptions.Enabled = true;
break;
}
tsbDeleteSelected.Enabled = CurrentShape != null;
tsbDeleteAll.Enabled = Shapes.Count > 0;
switch (shapeType)
{
default:

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

@ -170,6 +170,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\eraser.png" />
<None Include="Resources\ui-radio-button-uncheck.png" />
<None Include="Resources\layer--pencil.png" />
<None Include="Resources\printer.png" />