From d3d8e2dd1c7e08105b4c5a1cdc5c161a1300c6ca Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 1 Oct 2016 10:51:11 +0300 Subject: [PATCH] Change Enabled of controls instead of Visible, so menu size won't change --- .../Properties/Resources.Designer.cs | 20 +++---- .../Properties/Resources.resx | 6 +-- ShareX.ScreenCaptureLib/Resources/eraser.png | Bin 0 -> 656 bytes .../Shapes/ShapeManager.cs | 49 +++++++----------- .../ShareX.ScreenCaptureLib.csproj | 1 + 5 files changed, 33 insertions(+), 43 deletions(-) create mode 100644 ShareX.ScreenCaptureLib/Resources/eraser.png diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index abd5f16f4..3a584834f 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -239,6 +239,16 @@ internal class Resources { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap eraser { + get { + object obj = ResourceManager.GetObject("eraser", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -494,16 +504,6 @@ internal class Resources { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap minus { - get { - object obj = ResourceManager.GetObject("minus", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index 1f257cf2e..39bf942a5 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -253,9 +253,6 @@ X: {4} Y: {5} [3] Select pen drawing mode - - ..\Resources\minus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -492,4 +489,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}° ..\Resources\ui-radio-button-uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Resources/eraser.png b/ShareX.ScreenCaptureLib/Resources/eraser.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d4b0201b9fc3f6f6da0c9b888822eafaac8414 GIT binary patch literal 656 zcmV;B0&o3^P)1RCwB?lh2D1VHn4scXm_|RPb*o z2t2F@!9+q64R!|)wREXlm!UK;JjfC*NEabIL{LnZWuc;5?7HNoAE&4}dY4uA7Bo7F zznz)4=Y4a;*7ejgygcu`?|k0x_kG@X2q6UQh{xlQN~OTzaKP2V8xU}e%?d!m6d(ye z3FglRz)uq>7}!JxMj{c2#bV%cx!{txZUIg1etP?iiB)&*+w1;dlVT>5*#z>nEr66% zJt}oI4Xp@}uDvUL+_|^KjRAZYU~@3|*6#6Pse>@3Xx_4*)9JwN+WP|&K*DcskZd-~ z9XOrNWfnzo+p?_ilWP%0?{>K|vriUTKR*Y*-w(Bi`_I=LpwjkqIt}M?ImJkYfTAi> zW)4_iYc~J(DKFxda1owNCgFTOugqpMFijKOcazISelK93&j%-u_Fv%Wsjv!<$K!CJ zP*BhThwbLNa}$1@o#7f5hpUgDzQkiZK_B0QRpnx_s9^pFX03_J)?R|cr@4bySiob% zzVc(VmCNO_G8&E6j-uUeV+{rHdcCms;kEpL&?ceei#;zg?JO>firZMi qS0)6!_zO_`= 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().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: diff --git a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj index f34624659..6fc42200c 100644 --- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj +++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj @@ -170,6 +170,7 @@ +