Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes for list view text box scroll bar

Browse Source
This commit is contained in:
Nikolaj Olsson 2021-03-26 22:12:27 +01:00
parent 5b19c045f8
commit 8470163549
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/Controls/SETextBox.cs
View File

@ -350,12 +350,14 @@ namespace Nikse.SubtitleEdit.Controls
{ {
_simpleTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; _simpleTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
} }
else
_simpleTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None; {
_simpleTextBox.ScrollBars = System.Windows.Forms.ScrollBars.None;
}
} }
else if (_uiTextBox != null) else if (_uiTextBox != null)
{ {
_uiTextBox.ScrollBars = value; // auto show/hide for rich text box just works
} }
} }
} }

17
src/ui/Forms/Main.cs
View File

@ -4000,7 +4000,7 @@ namespace Nikse.SubtitleEdit.Forms
else if (!string.IsNullOrEmpty(Configuration.Settings.General.LastSaveAsFormat)) else if (!string.IsNullOrEmpty(Configuration.Settings.General.LastSaveAsFormat))
{ {
currentFormat = Utilities.GetSubtitleFormatByFriendlyName(Configuration.Settings.General.LastSaveAsFormat); currentFormat = Utilities.GetSubtitleFormatByFriendlyName(Configuration.Settings.General.LastSaveAsFormat);
} }
} }
if (currentFormat == null) if (currentFormat == null)
@ -9427,6 +9427,11 @@ namespace Nikse.SubtitleEdit.Forms
private static void FixVerticalScrollBars(SETextBox tb, ref int lastNumberOfNewLines) private static void FixVerticalScrollBars(SETextBox tb, ref int lastNumberOfNewLines)
{ {
if (!tb.Visible)
{
return;
}
var noOfNewLines = Utilities.GetNumberOfLines(tb.Text); var noOfNewLines = Utilities.GetNumberOfLines(tb.Text);
if (noOfNewLines == lastNumberOfNewLines) if (noOfNewLines == lastNumberOfNewLines)
{ {
@ -9436,7 +9441,8 @@ namespace Nikse.SubtitleEdit.Forms
lastNumberOfNewLines = noOfNewLines; lastNumberOfNewLines = noOfNewLines;
try try
{ {
if (noOfNewLines <= 1 && tb.Text.Length <= 300 || TextRenderer.MeasureText(tb.Text, tb.Font).Height < tb.Height) if (noOfNewLines <= 1 && tb.Text.Length <= 300 ||
TextRenderer.MeasureText(tb.Text, tb.Font).Height + (tb.Font.Bold ? 17 : 5) < tb.Height)
{ {
tb.ScrollBars = RichTextBoxScrollBars.None; tb.ScrollBars = RichTextBoxScrollBars.None;
} }
@ -21472,6 +21478,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
splitContainerListViewAndText.SplitterMoved += splitContainerListViewAndText_SplitterMoved; splitContainerListViewAndText.SplitterMoved += splitContainerListViewAndText_SplitterMoved;
splitContainerListViewAndText.SizeChanged += splitContainerListViewAndText_SizeChanged; splitContainerListViewAndText.SizeChanged += splitContainerListViewAndText_SizeChanged;
textBoxListViewText.SizeChanged += TextBoxListViewText_SizeChanged;
imageListBookmarks.Images.Add(pictureBoxBookmark.Image); imageListBookmarks.Images.Add(pictureBoxBookmark.Image);
SetListViewStateImages(); SetListViewStateImages();
@ -21639,6 +21646,12 @@ namespace Nikse.SubtitleEdit.Forms
textBoxSource.SelectionLength = 0; textBoxSource.SelectionLength = 0;
} }
private void TextBoxListViewText_SizeChanged(object sender, EventArgs e)
{
_lastNumberOfNewLines = -1;
FixVerticalScrollBars(textBoxListViewText, ref _lastNumberOfNewLines);
}
private void InitializePlayRateDropDown() private void InitializePlayRateDropDown()
{ {
toolStripSplitButtonPlayRate.DropDownItems.Clear(); toolStripSplitButtonPlayRate.DropDownItems.Clear();