mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 15:02:35 +01:00
Merge pull request #1452 from xylographe/xcomp
Fixed ShowTip method (Forms/Compare)
This commit is contained in:
commit
e5932f3289
2
src/Forms/Compare.Designer.cs
generated
2
src/Forms/Compare.Designer.cs
generated
@ -309,8 +309,8 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.Controls.Add(this.buttonOpenSubtitle2);
|
this.Controls.Add(this.buttonOpenSubtitle2);
|
||||||
this.Controls.Add(this.buttonOpenSubtitle1);
|
this.Controls.Add(this.buttonOpenSubtitle1);
|
||||||
this.Controls.Add(this.buttonOK);
|
this.Controls.Add(this.buttonOK);
|
||||||
this.Controls.Add(this.labelSubtitle2);
|
|
||||||
this.Controls.Add(this.subtitleListView2);
|
this.Controls.Add(this.subtitleListView2);
|
||||||
|
this.Controls.Add(this.labelSubtitle2);
|
||||||
this.Controls.Add(this.subtitleListView1);
|
this.Controls.Add(this.subtitleListView1);
|
||||||
this.Controls.Add(this.labelSubtitle1);
|
this.Controls.Add(this.labelSubtitle1);
|
||||||
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
|
@ -827,10 +827,18 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
|
|
||||||
private void ShowTip(Control control)
|
private void ShowTip(Control control)
|
||||||
{
|
{
|
||||||
string sub1Path = control.Text;
|
var text = control.Text;
|
||||||
if (!string.IsNullOrEmpty(sub1Path))
|
if (!string.IsNullOrEmpty(text))
|
||||||
{
|
{
|
||||||
toolTip1.Show(Path.GetFileName(sub1Path), control);
|
try
|
||||||
|
{
|
||||||
|
text = Path.GetFileName(text);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// not a path
|
||||||
|
}
|
||||||
|
toolTip1.Show(text, control);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user