Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 13:01:39 +01:00
Code Issues Projects Releases Wiki Activity

Fix minor issues regarding ocr+ui - thx Jamakmake :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2017-10-25 23:38:22 +02:00
parent c95dbf2317
commit 39bf3cef40
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/About.cs
View File

@ -58,7 +58,7 @@ namespace Nikse.SubtitleEdit.Forms
{
using (var g = CreateGraphics())
{
double height = g.MeasureString(richTextBoxAbout1.Text, richTextBoxAbout1.Font).Height + 5;
double height = g.MeasureString(richTextBoxAbout1.Text, richTextBoxAbout1.Font).Height + 15;
richTextBoxAbout1.Height = (int)height;
Height = richTextBoxAbout1.Top + richTextBoxAbout1.Height + 90;
}

4
src/Forms/ExportPngXml.cs
View File

@ -2374,6 +2374,10 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
parameter.P.Text = "<i>" + parameter.P.Text;
}
italicOn = parameter.P.Text.Contains("<i>") && !parameter.P.Text.Contains("</i>");
if (italicOn)
{
parameter.P.Text += "</i>";
}
parameter.P.Text = fontTag + parameter.P.Text;
if (parameter.P.Text.Contains("<font ") && !parameter.P.Text.Contains("</font>"))

21
src/Forms/Main.cs
View File

@ -17828,16 +17828,18 @@ namespace Nikse.SubtitleEdit.Forms
Configuration.Settings.General.Undocked = true;
var top = Math.Max(Top, 0);
var left = Math.Max(Left, 0);
UnDockVideoPlayer();
splitContainerListViewAndText.SplitterDistance = splitContainerListViewAndText.Height - 109;
if (toolStripButtonToggleVideo.Checked)
{
_videoPlayerUndocked.Show(this);
if (_videoPlayerUndocked.Top < -999 || _videoPlayerUndocked.Left < -999)
if (_videoPlayerUndocked.Top < -9 || _videoPlayerUndocked.Left < -9)
{
_videoPlayerUndocked.WindowState = FormWindowState.Minimized;
_videoPlayerUndocked.Top = Top + 40;
_videoPlayerUndocked.Left = Math.Abs(Left - 20);
_videoPlayerUndocked.Top = top + 40;
_videoPlayerUndocked.Left = Math.Abs(left - 20);
_videoPlayerUndocked.Width = 600;
_videoPlayerUndocked.Height = 400;
}
@ -17847,11 +17849,11 @@ namespace Nikse.SubtitleEdit.Forms
if (toolStripButtonToggleWaveform.Checked)
{
_waveformUndocked.Show(this);
if (_waveformUndocked.Top < -999 || _waveformUndocked.Left < -999)
if (_waveformUndocked.Top < -9 || _waveformUndocked.Left < -9)
{
_waveformUndocked.WindowState = FormWindowState.Minimized;
_waveformUndocked.Top = Top + 60;
_waveformUndocked.Left = Math.Abs(Left - 15);
_waveformUndocked.Top = top + 60;
_waveformUndocked.Left = Math.Abs(left - 15);
_waveformUndocked.Width = 600;
_waveformUndocked.Height = 200;
}
@ -17859,11 +17861,11 @@ namespace Nikse.SubtitleEdit.Forms
UnDockVideoButtons();
_videoControlsUndocked.Show(this);
if (_videoControlsUndocked.Top < -999 || _videoControlsUndocked.Left < -999)
if (_videoControlsUndocked.Top < -9 || _videoControlsUndocked.Left < -9)
{
_videoControlsUndocked.WindowState = FormWindowState.Minimized;
_videoControlsUndocked.Top = Top + 40;
_videoControlsUndocked.Left = Math.Abs(Left - 10);
_videoControlsUndocked.Top = top + 40;
_videoControlsUndocked.Left = Math.Abs(left - 10);
_videoControlsUndocked.Width = tabControlButtons.Width + 20;
_videoControlsUndocked.Height = tabControlButtons.Height + 65;
}
@ -17875,6 +17877,7 @@ namespace Nikse.SubtitleEdit.Forms
redockVideoControlsToolStripMenuItem.Visible = true;
tabControl1_SelectedIndexChanged(null, null);
_videoControlsUndocked.Refresh();
}
public void RedockVideoControlsToolStripMenuItemClick(object sender, EventArgs e)