Skip to content

Commit 5435b40

Browse files
committed
Size fixes & bugfix
1 parent 5b10eec commit 5435b40

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

External/Plugins/ProjectManager/Controls/OpenResourceForm.cs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@ private void InitializeComponent()
6666
this.textBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
6767
this.textBox.Location = new System.Drawing.Point(12, 32);
6868
this.textBox.Name = "textBox";
69-
this.textBox.Size = new System.Drawing.Size(446, 22);
69+
this.textBox.Size = new System.Drawing.Size(466, 22);
7070
this.textBox.TabIndex = 1;
7171
this.textBox.TextChanged += new System.EventHandler(this.TextBoxTextChanged);
7272
this.textBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TextBoxKeyDown);
7373
//
7474
// refreshButton
7575
//
7676
this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
77-
this.refreshButton.Location = new System.Drawing.Point(465, 30);
77+
this.refreshButton.Location = new System.Drawing.Point(485, 30);
7878
this.refreshButton.Name = "refreshButton";
7979
this.refreshButton.Size = new System.Drawing.Size(26, 23);
8080
this.refreshButton.TabIndex = 4;
@@ -83,21 +83,20 @@ private void InitializeComponent()
8383
// cbInClasspathsOnly
8484
//
8585
this.cbInClasspathsOnly.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
86-
this.cbInClasspathsOnly.Location = new System.Drawing.Point(279, 9);
87-
this.cbInClasspathsOnly.Size = new System.Drawing.Size(111, 17);
88-
this.cbInClasspathsOnly.AutoSize = true;
86+
this.cbInClasspathsOnly.Location = new System.Drawing.Point(380, 9);
87+
this.cbInClasspathsOnly.Size = new System.Drawing.Size(26, 24);
88+
this.cbInClasspathsOnly.Text = "In Classpaths only";
8989
this.cbInClasspathsOnly.Name = "cbInClasspathsOnly";
90+
this.cbInClasspathsOnly.AutoSize = true;
9091
this.cbInClasspathsOnly.TabIndex = 2;
91-
this.cbInClasspathsOnly.Text = "In Classpaths only";
92+
this.cbInClasspathsOnly.Checked = false;
9293
this.cbInClasspathsOnly.CheckedChanged += new System.EventHandler(this.CbInClasspathsOnlyCheckedChanged);
9394
//
9495
// checkBox
9596
//
9697
this.checkBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
97-
this.checkBox.Location = new System.Drawing.Point(396, 9);
98+
this.checkBox.Location = new System.Drawing.Point(480, 9);
9899
this.checkBox.Size = new System.Drawing.Size(26, 24);
99-
this.checkBox.CheckAlign = ContentAlignment.MiddleRight;
100-
this.checkBox.TextAlign = ContentAlignment.MiddleLeft;
101100
this.checkBox.Text = "Code files only";
102101
this.checkBox.Name = "checkBox";
103102
this.checkBox.AutoSize = true;
@@ -112,7 +111,7 @@ private void InitializeComponent()
112111
this.listBox.FormattingEnabled = true;
113112
this.listBox.Location = new System.Drawing.Point(12, 62);
114113
this.listBox.Name = "listBox";
115-
this.listBox.Size = new System.Drawing.Size(478, 276);
114+
this.listBox.Size = new System.Drawing.Size(498, 276);
116115
this.listBox.TabIndex = 5;
117116
this.listBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ListBoxDrawItem);
118117
this.listBox.Resize += new System.EventHandler(this.ListBoxResize);
@@ -122,7 +121,7 @@ private void InitializeComponent()
122121
//
123122
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
124123
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
125-
this.ClientSize = new System.Drawing.Size(502, 340);
124+
this.ClientSize = new System.Drawing.Size(522, 340);
126125
this.Controls.Add(this.cbInClasspathsOnly);
127126
this.Controls.Add(this.listBox);
128127
this.Controls.Add(this.textBox);
@@ -131,7 +130,7 @@ private void InitializeComponent()
131130
this.Controls.Add(this.checkBox);
132131
this.MaximizeBox = false;
133132
this.MinimizeBox = false;
134-
this.MinimumSize = new System.Drawing.Size(400, 300);
133+
this.MinimumSize = new System.Drawing.Size(480, 300);
135134
this.Name = "OpenResourceForm";
136135
this.ShowIcon = false;
137136
this.KeyPreview = true;
@@ -401,15 +400,15 @@ public List<String> GetProjectFolders()
401400
{
402401
String projectFolder = Path.GetDirectoryName(PluginBase.CurrentProject.ProjectPath);
403402
List<String> folders = new List<String>();
404-
if (!cbInClasspathsOnly.Checked) folders.Add(projectFolder);
403+
if (!cbInClasspathsOnly.Checked) folders.Add(projectFolder);
405404
if (!PluginMain.Settings.SearchExternalClassPath) return folders;
406405
foreach (String path in PluginBase.CurrentProject.SourcePaths)
407406
{
408407
if (Path.IsPathRooted(path)) folders.Add(path);
409408
else
410409
{
411410
String folder = Path.GetFullPath(Path.Combine(projectFolder, path));
412-
if (!folder.StartsWith(projectFolder)) folders.Add(folder);
411+
if (cbInClasspathsOnly.Checked || !folder.StartsWith(projectFolder)) folders.Add(folder);
413412
}
414413
}
415414
return folders;

0 commit comments

Comments
 (0)