mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Change Enabled of controls instead of Visible, so menu size won't change
This commit is contained in:
parent
3b9122b326
commit
d3d8e2dd1c
5 changed files with 33 additions and 43 deletions
|
@ -239,6 +239,16 @@ internal static System.Drawing.Bitmap edit_vertical_alignment_top {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <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>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -494,16 +504,6 @@ internal static System.Drawing.Bitmap layer_shape_text {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <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>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -253,9 +253,6 @@ X: {4} Y: {5}</value>
|
||||||
<data name="RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode" xml:space="preserve">
|
<data name="RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode" xml:space="preserve">
|
||||||
<value>[3] Select pen drawing mode</value>
|
<value>[3] Select pen drawing mode</value>
|
||||||
</data>
|
</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">
|
<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>
|
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</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">
|
<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>
|
<value>..\Resources\ui-radio-button-uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</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>
|
</root>
|
BIN
ShareX.ScreenCaptureLib/Resources/eraser.png
Normal file
BIN
ShareX.ScreenCaptureLib/Resources/eraser.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 656 B |
|
@ -185,7 +185,6 @@ public bool NodesVisible
|
||||||
private RegionCaptureForm form;
|
private RegionCaptureForm form;
|
||||||
private Form menuForm;
|
private Form menuForm;
|
||||||
private ToolStripEx tsMain;
|
private ToolStripEx tsMain;
|
||||||
private ToolStripSeparator tssObjectActions, tssShapeOptions;
|
|
||||||
private ToolStripButton tsbDeleteSelected, tsbDeleteAll;
|
private ToolStripButton tsbDeleteSelected, tsbDeleteAll;
|
||||||
private ToolStripDropDownButton tsddbShapeOptions;
|
private ToolStripDropDownButton tsddbShapeOptions;
|
||||||
private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
|
private ToolStripMenuItem tsmiBorderColor, tsmiFillColor, tsmiHighlightColor, tsmiQuickCrop;
|
||||||
|
@ -449,27 +448,7 @@ private void CreateMenu()
|
||||||
|
|
||||||
#region Selected object
|
#region Selected object
|
||||||
|
|
||||||
tssObjectActions = new ToolStripSeparator();
|
tsMain.Items.Add(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);
|
|
||||||
|
|
||||||
tsddbShapeOptions = new ToolStripDropDownButton("Shape options");
|
tsddbShapeOptions = new ToolStripDropDownButton("Shape options");
|
||||||
tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
|
||||||
|
@ -660,7 +639,19 @@ private void CreateMenu()
|
||||||
};
|
};
|
||||||
tsddbShapeOptions.DropDownItems.Add(tsmiHighlightColor);
|
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
|
#region Capture
|
||||||
|
|
||||||
|
@ -829,9 +820,6 @@ private void UpdateMenu()
|
||||||
|
|
||||||
ShapeType shapeType = CurrentShapeType;
|
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))
|
foreach (ToolStripButton tsb in tsMain.Items.OfType<ToolStripButton>().Where(x => x.Tag is ShapeType))
|
||||||
{
|
{
|
||||||
if ((ShapeType)tsb.Tag == shapeType)
|
if ((ShapeType)tsb.Tag == shapeType)
|
||||||
|
@ -917,8 +905,7 @@ private void UpdateMenu()
|
||||||
switch (shapeType)
|
switch (shapeType)
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
tssShapeOptions.Visible = false;
|
tsddbShapeOptions.Enabled = false;
|
||||||
tsddbShapeOptions.Visible = false;
|
|
||||||
break;
|
break;
|
||||||
case ShapeType.RegionRoundedRectangle:
|
case ShapeType.RegionRoundedRectangle:
|
||||||
case ShapeType.DrawingRectangle:
|
case ShapeType.DrawingRectangle:
|
||||||
|
@ -933,11 +920,13 @@ private void UpdateMenu()
|
||||||
case ShapeType.EffectBlur:
|
case ShapeType.EffectBlur:
|
||||||
case ShapeType.EffectPixelate:
|
case ShapeType.EffectPixelate:
|
||||||
case ShapeType.EffectHighlight:
|
case ShapeType.EffectHighlight:
|
||||||
tssShapeOptions.Visible = true;
|
tsddbShapeOptions.Enabled = true;
|
||||||
tsddbShapeOptions.Visible = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tsbDeleteSelected.Enabled = CurrentShape != null;
|
||||||
|
tsbDeleteAll.Enabled = Shapes.Count > 0;
|
||||||
|
|
||||||
switch (shapeType)
|
switch (shapeType)
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -170,6 +170,7 @@
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<None Include="Resources\eraser.png" />
|
||||||
<None Include="Resources\ui-radio-button-uncheck.png" />
|
<None Include="Resources\ui-radio-button-uncheck.png" />
|
||||||
<None Include="Resources\layer--pencil.png" />
|
<None Include="Resources\layer--pencil.png" />
|
||||||
<None Include="Resources\printer.png" />
|
<None Include="Resources\printer.png" />
|
||||||
|
|
Loading…
Reference in a new issue