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

Fix History form controls not resizing properly

Browse source 
For some reason anchoring in SplitContainers works strangely, just dropping a regular Panel in fixes it
This commit is contained in:
SupSuper 2018-04-15 18:32:53 +01:00
parent 3f01e83ddc
commit 48402c740b
2 changed files with 95 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ShareX.HistoryLib/HistoryForm.Designer.cs generated
View file

@ -30,17 +30,18 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HistoryForm));
this.btnApplyFilters = new System.Windows.Forms.Button();
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.lvHistory = new ShareX.HelpersLib.MyListView();
this.chIcon = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chDateTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chURL = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.panel1 = new System.Windows.Forms.Panel();
this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox();
this.gbFilters = new System.Windows.Forms.GroupBox();
this.cbHostFilterSelection = new System.Windows.Forms.ComboBox();
this.btnRemoveFilters = new System.Windows.Forms.Button();
this.btnApplyFilters = new System.Windows.Forms.Button();
this.cbTypeFilterSelection = new System.Windows.Forms.ComboBox();
this.cbHostFilter = new System.Windows.Forms.CheckBox();
this.cbTypeFilter = new System.Windows.Forms.CheckBox();
@ -56,16 +57,10 @@ private void InitializeComponent()
this.scMain.Panel1.SuspendLayout();
this.scMain.Panel2.SuspendLayout();
this.scMain.SuspendLayout();
this.panel1.SuspendLayout();
this.gbFilters.SuspendLayout();
this.SuspendLayout();
//
// btnApplyFilters
//
resources.ApplyResources(this.btnApplyFilters, "btnApplyFilters");
this.btnApplyFilters.Name = "btnApplyFilters";
this.btnApplyFilters.UseVisualStyleBackColor = true;
this.btnApplyFilters.Click += new System.EventHandler(this.btnApplyFilters_Click);
//
// scMain
//
resources.ApplyResources(this.scMain, "scMain");
@ -78,8 +73,7 @@ private void InitializeComponent()
//
// scMain.Panel2
//
this.scMain.Panel2.Controls.Add(this.pbThumbnail);
this.scMain.Panel2.Controls.Add(this.gbFilters);
this.scMain.Panel2.Controls.Add(this.panel1);
this.scMain.SplitterColor = System.Drawing.Color.DarkGray;
this.scMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.scMain_SplitterMoved);
//
@ -121,6 +115,13 @@ private void InitializeComponent()
//
resources.ApplyResources(this.chURL, "chURL");
//
// panel1
//
this.panel1.Controls.Add(this.pbThumbnail);
this.panel1.Controls.Add(this.gbFilters);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
// pbThumbnail
//
resources.ApplyResources(this.pbThumbnail, "pbThumbnail");
@ -164,6 +165,13 @@ private void InitializeComponent()
this.btnRemoveFilters.UseVisualStyleBackColor = true;
this.btnRemoveFilters.Click += new System.EventHandler(this.btnRemoveFilters_Click);
//
// btnApplyFilters
//
resources.ApplyResources(this.btnApplyFilters, "btnApplyFilters");
this.btnApplyFilters.Name = "btnApplyFilters";
this.btnApplyFilters.UseVisualStyleBackColor = true;
this.btnApplyFilters.Click += new System.EventHandler(this.btnApplyFilters_Click);
//
// cbTypeFilterSelection
//
this.cbTypeFilterSelection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@ -248,6 +256,7 @@ private void InitializeComponent()
this.scMain.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
this.scMain.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.gbFilters.ResumeLayout(false);
this.gbFilters.PerformLayout();
this.ResumeLayout(false);
@ -260,23 +269,24 @@ private void InitializeComponent()
private System.Windows.Forms.ColumnHeader chFilename;
private System.Windows.Forms.ColumnHeader chDateTime;
private System.Windows.Forms.ColumnHeader chURL;
private System.Windows.Forms.DateTimePicker dtpFilterFrom;
private System.Windows.Forms.CheckBox cbDateFilter;
private System.Windows.Forms.Label lblFilterFrom;
private System.Windows.Forms.Label lblFilterTo;
private System.Windows.Forms.DateTimePicker dtpFilterTo;
private System.Windows.Forms.Button btnApplyFilters;
private System.Windows.Forms.TextBox txtFilenameFilter;
private System.Windows.Forms.ComboBox cbFilenameFilterMethod;
private System.Windows.Forms.CheckBox cbFilenameFilter;
private ShareX.HelpersLib.MyPictureBox pbThumbnail;
private System.Windows.Forms.ColumnHeader chIcon;
private ShareX.HelpersLib.SplitContainerCustomSplitter scMain;
private System.Windows.Forms.Panel panel1;
private HelpersLib.MyPictureBox pbThumbnail;
private System.Windows.Forms.GroupBox gbFilters;
private System.Windows.Forms.ComboBox cbHostFilterSelection;
private System.Windows.Forms.Button btnRemoveFilters;
private System.Windows.Forms.Button btnApplyFilters;
private System.Windows.Forms.ComboBox cbTypeFilterSelection;
private System.Windows.Forms.CheckBox cbHostFilter;
private System.Windows.Forms.CheckBox cbTypeFilter;
private System.Windows.Forms.ColumnHeader chIcon;
private ShareX.HelpersLib.SplitContainerCustomSplitter scMain;
private System.Windows.Forms.ComboBox cbHostFilterSelection;
private System.Windows.Forms.DateTimePicker dtpFilterFrom;
private System.Windows.Forms.Label lblFilterFrom;
private System.Windows.Forms.CheckBox cbFilenameFilter;
private System.Windows.Forms.Label lblFilterTo;
private System.Windows.Forms.CheckBox cbDateFilter;
private System.Windows.Forms.DateTimePicker dtpFilterTo;
private System.Windows.Forms.TextBox txtFilenameFilter;
private System.Windows.Forms.ComboBox cbFilenameFilterMethod;
}
}

100
ShareX.HistoryLib/HistoryForm.resx
View file

@ -118,44 +118,17 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnApplyFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnApplyFilters.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 210</value>
</data>
<data name="btnApplyFilters.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnApplyFilters.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="btnApplyFilters.Text" xml:space="preserve">
<value>Apply filters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Name" xml:space="preserve">
<value>btnApplyFilters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Parent" xml:space="preserve">
<value>gbFilters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="scMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="chIcon.Text" xml:space="preserve">
<value />
<comment>@Invariant</comment></data>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="chIcon.Width" type="System.Int32, mscorlib">
<value>24</value>
</data>
@ -173,7 +146,7 @@
</data>
<data name="chURL.Text" xml:space="preserve">
<value>URL</value>
<comment>@Invariant</comment></data>
</data>
<data name="chURL.Width" type="System.Int32, mscorlib">
<value>230</value>
</data>
@ -193,7 +166,7 @@
<value>lvHistory</value>
</data>
<data name="&gt;&gt;lvHistory.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvHistory.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
@ -226,16 +199,16 @@
<value>406, 368</value>
</data>
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
<value>3</value>
</data>
<data name="&gt;&gt;pbThumbnail.Name" xml:space="preserve">
<value>pbThumbnail</value>
</data>
<data name="&gt;&gt;pbThumbnail.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pbThumbnail.Parent" xml:space="preserve">
<value>scMain.Panel2</value>
<value>panel1</value>
</data>
<data name="&gt;&gt;pbThumbnail.ZOrder" xml:space="preserve">
<value>0</value>
@ -291,6 +264,33 @@
<data name="&gt;&gt;btnRemoveFilters.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnApplyFilters.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnApplyFilters.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 210</value>
</data>
<data name="btnApplyFilters.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 24</value>
</data>
<data name="btnApplyFilters.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="btnApplyFilters.Text" xml:space="preserve">
<value>Apply filters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Name" xml:space="preserve">
<value>btnApplyFilters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnApplyFilters.Parent" xml:space="preserve">
<value>gbFilters</value>
</data>
<data name="&gt;&gt;btnApplyFilters.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="cbTypeFilterSelection.Location" type="System.Drawing.Point, System.Drawing">
<value>168, 150</value>
</data>
@ -595,7 +595,7 @@
<value>406, 250</value>
</data>
<data name="gbFilters.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<value>4</value>
</data>
<data name="gbFilters.Text" xml:space="preserve">
<value>Filters</value>
@ -607,11 +607,35 @@
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;gbFilters.Parent" xml:space="preserve">
<value>scMain.Panel2</value>
<value>panel1</value>
</data>
<data name="&gt;&gt;gbFilters.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>428, 641</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;panel1.Name" xml:space="preserve">
<value>panel1</value>
</data>
<data name="&gt;&gt;panel1.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;panel1.Parent" xml:space="preserve">
<value>scMain.Panel2</value>
</data>
<data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;scMain.Panel2.Name" xml:space="preserve">
<value>scMain.Panel2</value>
</data>
@ -643,7 +667,7 @@
<value>scMain</value>
</data>
<data name="&gt;&gt;scMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scMain.Parent" xml:space="preserve">
<value>$this</value>