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

Fix padding related issue

Browse source
This commit is contained in:
Jaex 2017-05-27 14:11:21 +03:00
parent 173a4f2ebd
commit 5e97210afe
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs
View file

@ -136,6 +136,7 @@ private void CreateToolbar()
tsbCompleteEdit.Text = "Apply changes & continue task (Enter)";
}
tsbCompleteEdit.Padding = new Padding(buttonPadding);
tsbCompleteEdit.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbCompleteEdit.Image = Resources.tick;
tsbCompleteEdit.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateRunAfterCaptureTasks);
@ -144,12 +145,14 @@ private void CreateToolbar()
if (form.Mode == RegionCaptureMode.TaskEditor)
{
ToolStripButton tsbClose = new ToolStripButton("Continue task (Space or right click)");
tsbClose.Padding = new Padding(buttonPadding);
tsbClose.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbClose.Image = Resources.control;
tsbClose.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateContinueTask);
tsMain.Items.Add(tsbClose);
ToolStripButton tsbCloseCancel = new ToolStripButton("Cancel task (Esc)");
tsbCloseCancel.Padding = new Padding(buttonPadding);
tsbCloseCancel.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbCloseCancel.Image = Resources.cross;
tsbCloseCancel.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateCancelTask);
@ -162,6 +165,7 @@ private void CreateToolbar()
}
ToolStripButton tsbSaveImage = new ToolStripButton("Save image");
tsbSaveImage.Padding = new Padding(buttonPadding);
tsbSaveImage.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbSaveImage.Enabled = File.Exists(form.ImageFilePath);
tsbSaveImage.Image = Resources.disk_black;
@ -169,24 +173,28 @@ private void CreateToolbar()
tsMain.Items.Add(tsbSaveImage);
ToolStripButton tsbSaveImageAs = new ToolStripButton("Save image as...");
tsbSaveImageAs.Padding = new Padding(buttonPadding);
tsbSaveImageAs.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbSaveImageAs.Image = Resources.disks_black;
tsbSaveImageAs.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateSaveImageAs);
tsMain.Items.Add(tsbSaveImageAs);
ToolStripButton tsbCopyImage = new ToolStripButton("Copy image to clipboard");
tsbCopyImage.Padding = new Padding(buttonPadding);
tsbCopyImage.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbCopyImage.Image = Resources.clipboard;
tsbCopyImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateCopyImage);
tsMain.Items.Add(tsbCopyImage);
ToolStripButton tsbUploadImage = new ToolStripButton("Upload image");
tsbUploadImage.Padding = new Padding(buttonPadding);
tsbUploadImage.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbUploadImage.Image = Resources.drive_globe;
tsbUploadImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateUploadImage);
tsMain.Items.Add(tsbUploadImage);
ToolStripButton tsbPrintImage = new ToolStripButton("Print image...");
tsbPrintImage.Padding = new Padding(buttonPadding);
tsbPrintImage.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbPrintImage.Image = Resources.printer;
tsbPrintImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotatePrintImage);
@ -218,6 +226,7 @@ private void CreateToolbar()
}
ToolStripButton tsbShapeType = new ToolStripButton(shapeType.GetLocalizedDescription());
tsbShapeType.Padding = new Padding(buttonPadding);
tsbShapeType.DisplayStyle = ToolStripItemDisplayStyle.Image;
Image img = null;
@ -300,6 +309,7 @@ private void CreateToolbar()
tsMain.Items.Add(new ToolStripSeparator());
tsbBorderColor = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Border_color___);
tsbBorderColor.Padding = new Padding(buttonPadding);
tsbBorderColor.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbBorderColor.Click += (sender, e) =>
{
@ -357,6 +367,7 @@ private void CreateToolbar()
tsMain.Items.Add(tsbBorderColor);
tsbFillColor = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Fill_color___);
tsbFillColor.Padding = new Padding(buttonPadding);
tsbFillColor.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbFillColor.Click += (sender, e) =>
{
@ -406,6 +417,7 @@ private void CreateToolbar()
tsMain.Items.Add(tsbFillColor);
tsbHighlightColor = new ToolStripButton(Resources.ShapeManager_CreateContextMenu_Highlight_color___);
tsbHighlightColor.Padding = new Padding(buttonPadding);
tsbHighlightColor.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsbHighlightColor.Click += (sender, e) =>
{
@ -426,6 +438,7 @@ private void CreateToolbar()
tsMain.Items.Add(tsbHighlightColor);
tsddbShapeOptions = new ToolStripDropDownButton("Shape options");
tsddbShapeOptions.Padding = new Padding(buttonPadding);
tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbShapeOptions.Image = Resources.layer__pencil;
tsMain.Items.Add(tsddbShapeOptions);
@ -519,6 +532,7 @@ private void CreateToolbar()
#region Edit
ToolStripDropDownButton tsddbEdit = new ToolStripDropDownButton("Edit");
tsddbEdit.Padding = new Padding(buttonPadding);
tsddbEdit.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbEdit.Image = Resources.wrench_screwdriver;
tsMain.Items.Add(tsddbEdit);
@ -578,6 +592,7 @@ private void CreateToolbar()
#region Capture
ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton("Capture");
tsddbCapture.Padding = new Padding(buttonPadding);
tsddbCapture.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbCapture.Image = Resources.camera;
tsMain.Items.Add(tsddbCapture);
@ -638,6 +653,7 @@ private void CreateToolbar()
#region Options
ToolStripDropDownButton tsddbOptions = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Options);
tsddbOptions.Padding = new Padding(buttonPadding);
tsddbOptions.DisplayStyle = ToolStripItemDisplayStyle.Image;
tsddbOptions.Image = Resources.gear;
tsMain.Items.Add(tsddbOptions);
@ -750,12 +766,16 @@ private void CreateToolbar()
tslDragLeft.MouseLeave += TslDrag_MouseLeave;
tslDragRight.MouseLeave += TslDrag_MouseLeave;
tsMain.ResumeLayout(false);
tsMain.PerformLayout();
menuForm.ResumeLayout(false);
menuForm.Show(form);
foreach (ToolStripItem tsi in tsMain.Items.OfType<ToolStripItem>())
{
if (!string.IsNullOrEmpty(tsi.Text))
{
tsi.Padding = new Padding(buttonPadding);
tsi.MouseEnter += (sender, e) =>
{
Point pos = CaptureHelpers.ScreenToClient(menuForm.PointToScreen(tsi.Bounds.Location));
@ -770,12 +790,6 @@ private void CreateToolbar()
}
}
tsMain.ResumeLayout(false);
tsMain.PerformLayout();
menuForm.ResumeLayout(false);
menuForm.Show(form);
UpdateMenu();
CurrentShapeChanged += shape => UpdateMenu();