cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-10-04 19:37:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove dropdown arrows from non-split buttons and adjust margins/padding

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2015-07-01 15:25:49 -04:00
parent 2f1e8764dc
commit 094eb0381c
3 changed files with 161 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
NAPS2.Core/WinForms/FDesktop.Designer.cs generated
View File

@ -186,18 +186,16 @@ namespace NAPS2.WinForms
// tsProfiles
//
resources.ApplyResources(this.tsProfiles, "tsProfiles");
this.tsProfiles.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsProfiles.Name = "tsProfiles";
this.tsProfiles.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsProfiles.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsProfiles.Click += new System.EventHandler(this.tsProfiles_Click);
//
// tsOcr
//
this.tsOcr.Image = global::NAPS2.Icons.text;
resources.ApplyResources(this.tsOcr, "tsOcr");
this.tsOcr.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsOcr.Name = "tsOcr";
this.tsOcr.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsOcr.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsOcr.Click += new System.EventHandler(this.tsOcr_Click);
//
// toolStripSeparator5
@ -295,8 +293,9 @@ namespace NAPS2.WinForms
this.tsFlip});
this.tsdRotate.Image = global::NAPS2.Icons.arrow_rotate_anticlockwise;
resources.ApplyResources(this.tsdRotate, "tsdRotate");
this.tsdRotate.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsdRotate.Name = "tsdRotate";
this.tsdRotate.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsdRotate.ShowDropDownArrow = false;
//
// tsRotateLeft
//
@ -323,18 +322,16 @@ namespace NAPS2.WinForms
//
this.tsMoveUp.Image = global::NAPS2.Icons.arrow_up;
resources.ApplyResources(this.tsMoveUp, "tsMoveUp");
this.tsMoveUp.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsMoveUp.Name = "tsMoveUp";
this.tsMoveUp.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsMoveUp.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsMoveUp.Click += new System.EventHandler(this.tsMoveUp_Click);
//
// tsMoveDown
//
this.tsMoveDown.Image = global::NAPS2.Icons.arrow_down;
resources.ApplyResources(this.tsMoveDown, "tsMoveDown");
this.tsMoveDown.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsMoveDown.Name = "tsMoveDown";
this.tsMoveDown.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsMoveDown.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsMoveDown.Click += new System.EventHandler(this.tsMoveDown_Click);
//
// tsdReorder
@ -346,8 +343,9 @@ namespace NAPS2.WinForms
this.tsReverse});
this.tsdReorder.Image = global::NAPS2.Icons.arrow_refresh;
resources.ApplyResources(this.tsdReorder, "tsdReorder");
this.tsdReorder.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsdReorder.Name = "tsdReorder";
this.tsdReorder.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsdReorder.ShowDropDownArrow = false;
//
// tsInterleave
//
@ -395,18 +393,16 @@ namespace NAPS2.WinForms
//
this.tsDelete.Image = global::NAPS2.Icons.cross;
resources.ApplyResources(this.tsDelete, "tsDelete");
this.tsDelete.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsDelete.Name = "tsDelete";
this.tsDelete.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsDelete.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsDelete.Click += new System.EventHandler(this.tsDelete_Click);
//
// tsClear
//
this.tsClear.Image = global::NAPS2.Icons.cancel;
resources.ApplyResources(this.tsClear, "tsClear");
this.tsClear.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsClear.Name = "tsClear";
this.tsClear.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsClear.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsClear.Click += new System.EventHandler(this.tsClear_Click);
//
// toolStripSeparator3
@ -418,15 +414,15 @@ namespace NAPS2.WinForms
//
this.toolStripDropDownButton1.Image = global::NAPS2.Icons.world;
resources.ApplyResources(this.toolStripDropDownButton1, "toolStripDropDownButton1");
this.toolStripDropDownButton1.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
this.toolStripDropDownButton1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.toolStripDropDownButton1.ShowDropDownArrow = false;
//
// tsAbout
//
resources.ApplyResources(this.tsAbout, "tsAbout");
this.tsAbout.Margin = new System.Windows.Forms.Padding(5, 1, 5, 2);
this.tsAbout.Name = "tsAbout";
this.tsAbout.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.tsAbout.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.tsAbout.Click += new System.EventHandler(this.tsAbout_Click);
//
// FDesktop

32
NAPS2.Core/WinForms/FDesktop.cs
View File

@ -118,23 +118,43 @@ namespace NAPS2.WinForms
{
btn.Text = stringWrapper.Wrap(btn.Text, 80, CreateGraphics(), btn.Font);
}
// Reset margin
SetToolbarButtonMargin(new Padding(5, 1, 5, 2));
ResetToolbarMargin();
// Recalculate visibility for the below check
Application.DoEvents();
// Check if toolbar buttons are overflowing
if (tStrip.Items.OfType<ToolStripItem>().Any(btn => !btn.Visible))
{
// Shrink the margin to help the buttons fit
SetToolbarButtonMargin(new Padding(0, 1, 0, 2));
ShrinkToolbarMargin();
}
}
private void SetToolbarButtonMargin(Padding margin)
private void ResetToolbarMargin()
{
foreach (var btn in tStrip.Items.OfType<ToolStripItem>())
{
btn.Margin = margin;
if (btn is ToolStripSplitButton)
{
btn.Margin = new Padding(5, 1, 5, 2);
}
else
{
btn.Padding = new Padding(10, 0, 10, 0);
}
}
}
private void ShrinkToolbarMargin()
{
foreach (var btn in tStrip.Items.OfType<ToolStripItem>())
{
if (btn is ToolStripSplitButton)
{
btn.Margin = new Padding(0, 1, 0, 2);
}
else
{
btn.Padding = new Padding(5, 0, 5, 0);
}
}
}

244
NAPS2.Core/WinForms/FDesktop.resx
View File

@ -133,34 +133,6 @@
<value>233, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="ctxView.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt, style=Bold</value>
</data>
<data name="ctxView.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxView.Text" xml:space="preserve">
<value>View</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ctxSelectAll.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+A</value>
</data>
<data name="ctxSelectAll.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxSelectAll.Text" xml:space="preserve">
<value>Select All</value>
</data>
<data name="ctxCopy.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+C</value>
</data>
<data name="ctxCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxCopy.Text" xml:space="preserve">
<value>Copy</value>
</data>
<data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>165, 70</value>
</data>
@ -170,6 +142,7 @@
<data name="&gt;&gt;contextMenuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="thumbnailList1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -187,7 +160,7 @@
<value>thumbnailList1</value>
</data>
<data name="&gt;&gt;thumbnailList1.Type" xml:space="preserve">
<value>NAPS2.WinForms.ThumbnailList, NAPS2.Core, Version=3.3.3.28227, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.ThumbnailList, NAPS2.Core, Version=3.3.4.25619, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;thumbnailList1.Parent" xml:space="preserve">
<value>toolStripContainer1.ContentPanel</value>
@ -252,15 +225,6 @@
<data name="tStrip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsNewProfile.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsNewProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="tsNewProfile.Text" xml:space="preserve">
<value>New Profile</value>
</data>
<data name="tsScan.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@ -314,7 +278,7 @@
<value>Magenta</value>
</data>
<data name="tsProfiles.Size" type="System.Drawing.Size, System.Drawing">
<value>60, 51</value>
<value>70, 51</value>
</data>
<data name="tsProfiles.Text" xml:space="preserve">
<value>Profiles</value>
@ -326,7 +290,7 @@
<value>Magenta</value>
</data>
<data name="tsOcr.Size" type="System.Drawing.Size, System.Drawing">
<value>46, 51</value>
<value>56, 51</value>
</data>
<data name="tsOcr.Text" xml:space="preserve">
<value>OCR</value>
@ -385,18 +349,6 @@
<data name="tsdSaveImages.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageAboveText</value>
</data>
<data name="tsEmailPDFAll.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsEmailPDFAll.Text" xml:space="preserve">
<value>All ({0})</value>
</data>
<data name="tsEmailPDFSelected.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsEmailPDFSelected.Text" xml:space="preserve">
<value>Selected ({0})</value>
</data>
<data name="tsdEmailPDF.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@ -424,38 +376,11 @@
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 54</value>
</data>
<data name="tsRotateLeft.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsRotateLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsRotateLeft.Text" xml:space="preserve">
<value>Rotate Left</value>
</data>
<data name="tsRotateRight.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsRotateRight.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsRotateRight.Text" xml:space="preserve">
<value>Rotate Right</value>
</data>
<data name="tsFlip.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsFlip.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsFlip.Text" xml:space="preserve">
<value>Flip</value>
</data>
<data name="tsdRotate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsdRotate.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 51</value>
<value>65, 51</value>
</data>
<data name="tsdRotate.Text" xml:space="preserve">
<value>Rotate</value>
@ -467,7 +392,7 @@
<value>Magenta</value>
</data>
<data name="tsMoveUp.Size" type="System.Drawing.Size, System.Drawing">
<value>69, 51</value>
<value>79, 51</value>
</data>
<data name="tsMoveUp.Text" xml:space="preserve">
<value>Move Up</value>
@ -479,7 +404,7 @@
<value>Magenta</value>
</data>
<data name="tsMoveDown.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 51</value>
<value>95, 51</value>
</data>
<data name="tsMoveDown.Text" xml:space="preserve">
<value>Move Down</value>
@ -487,44 +412,11 @@
<data name="tsMoveDown.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
<value>ImageAboveText</value>
</data>
<data name="tsInterleave.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsInterleave.Text" xml:space="preserve">
<value>Interleave</value>
</data>
<data name="tsDeinterleave.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsDeinterleave.Text" xml:space="preserve">
<value>Deinterleave</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 6</value>
</data>
<data name="tsReverseAll.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsReverseAll.Text" xml:space="preserve">
<value>All ({0})</value>
</data>
<data name="tsReverseSelected.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsReverseSelected.Text" xml:space="preserve">
<value>Selected ({0})</value>
</data>
<data name="tsReverse.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsReverse.Text" xml:space="preserve">
<value>Reverse</value>
</data>
<data name="tsdReorder.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="tsdReorder.Size" type="System.Drawing.Size, System.Drawing">
<value>61, 51</value>
<value>72, 51</value>
</data>
<data name="tsdReorder.Text" xml:space="preserve">
<value>Reorder</value>
@ -539,7 +431,7 @@
<value>Magenta</value>
</data>
<data name="tsDelete.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 51</value>
<value>64, 51</value>
</data>
<data name="tsDelete.Text" xml:space="preserve">
<value>Delete</value>
@ -551,7 +443,7 @@
<value>Magenta</value>
</data>
<data name="tsClear.Size" type="System.Drawing.Size, System.Drawing">
<value>48, 51</value>
<value>58, 51</value>
</data>
<data name="tsClear.Text" xml:space="preserve">
<value>Clear</value>
@ -566,7 +458,7 @@
<value>Magenta</value>
</data>
<data name="toolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
<value>72, 51</value>
<value>83, 51</value>
</data>
<data name="toolStripDropDownButton1.Text" xml:space="preserve">
<value>Language</value>
@ -618,7 +510,7 @@
<value>Magenta</value>
</data>
<data name="tsAbout.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 51</value>
<value>64, 51</value>
</data>
<data name="tsAbout.Text" xml:space="preserve">
<value>About</value>
@ -630,7 +522,7 @@
<value>3, 0</value>
</data>
<data name="tStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1139, 54</value>
<value>1142, 54</value>
</data>
<data name="tStrip.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@ -674,6 +566,114 @@
<data name="&gt;&gt;toolStripContainer1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="ctxView.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt, style=Bold</value>
</data>
<data name="ctxView.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxView.Text" xml:space="preserve">
<value>View</value>
</data>
<data name="ctxSelectAll.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+A</value>
</data>
<data name="ctxSelectAll.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxSelectAll.Text" xml:space="preserve">
<value>Select All</value>
</data>
<data name="ctxCopy.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>Ctrl+C</value>
</data>
<data name="ctxCopy.Size" type="System.Drawing.Size, System.Drawing">
<value>164, 22</value>
</data>
<data name="ctxCopy.Text" xml:space="preserve">
<value>Copy</value>
</data>
<data name="tsNewProfile.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsNewProfile.Size" type="System.Drawing.Size, System.Drawing">
<value>135, 22</value>
</data>
<data name="tsNewProfile.Text" xml:space="preserve">
<value>New Profile</value>
</data>
<data name="tsEmailPDFAll.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="tsEmailPDFAll.Text" xml:space="preserve">
<value>All ({0})</value>
</data>
<data name="tsEmailPDFSelected.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value>
</data>
<data name="tsEmailPDFSelected.Text" xml:space="preserve">
<value>Selected ({0})</value>
</data>
<data name="tsRotateLeft.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsRotateLeft.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsRotateLeft.Text" xml:space="preserve">
<value>Rotate Left</value>
</data>
<data name="tsRotateRight.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsRotateRight.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsRotateRight.Text" xml:space="preserve">
<value>Rotate Right</value>
</data>
<data name="tsFlip.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
<value>None</value>
</data>
<data name="tsFlip.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsFlip.Text" xml:space="preserve">
<value>Flip</value>
</data>
<data name="tsInterleave.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsInterleave.Text" xml:space="preserve">
<value>Interleave</value>
</data>
<data name="tsDeinterleave.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsDeinterleave.Text" xml:space="preserve">
<value>Deinterleave</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>136, 6</value>
</data>
<data name="tsReverse.Size" type="System.Drawing.Size, System.Drawing">
<value>139, 22</value>
</data>
<data name="tsReverse.Text" xml:space="preserve">
<value>Reverse</value>
</data>
<data name="tsReverseAll.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsReverseAll.Text" xml:space="preserve">
<value>All ({0})</value>
</data>
<data name="tsReverseSelected.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 22</value>
</data>
<data name="tsReverseSelected.Text" xml:space="preserve">
<value>Selected ({0})</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -942,6 +942,6 @@
<value>FDesktop</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.3.28227, Culture=neutral, PublicKeyToken=null</value>
<value>NAPS2.WinForms.FormBase, NAPS2.Core, Version=3.3.4.25619, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>