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

Try to improve list view selected line

Browse Source
This commit is contained in:
niksedk 2023-08-25 18:42:32 +02:00
parent 5f176fc893
commit ccd763d4ff
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ui/Controls/SubtitleListView.cs
View File

@ -432,13 +432,25 @@ namespace Nikse.SubtitleEdit.Controls
return;
}
var backgroundColor = Items[e.ItemIndex].SubItems[e.ColumnIndex].BackColor;
if (e.Item.Selected)
if (e.Item.Selected && !(Focused && e.ColumnIndex > 0))
{
var rect = e.Bounds;
if (Configuration.Settings != null)
{
backgroundColor = backgroundColor == BackColor ? Configuration.Settings.Tools.ListViewUnfocusedSelectedColor : GetCustomColor(backgroundColor);
Color backgroundColor;
if (Configuration.Settings.General.UseDarkTheme)
{
backgroundColor = Color.FromArgb(24, 52, 75);
}
else if (Focused)
{
backgroundColor = Color.FromArgb(0, 120, 215);
}
else
{
backgroundColor = Color.FromArgb(204, 232, 255);
}
using (var sb = new SolidBrush(backgroundColor))
{
e.Graphics.FillRectangle(sb, rect);
@ -460,8 +472,15 @@ namespace Nikse.SubtitleEdit.Controls
e.Graphics.DrawImage(StateImageList.Images[e.Item.StateImageIndex], new Rectangle(rect.X + 4, rect.Y + 2, 16, 16));
}
using (var f = new Font(e.Item.SubItems[e.ColumnIndex].Font.FontFamily, e.Item.SubItems[e.ColumnIndex].Font.Size - 0.5f, e.Item.SubItems[e.ColumnIndex].Font.Style))
using (var f = new Font(e.Item.SubItems[e.ColumnIndex].Font.FontFamily, e.Item.SubItems[e.ColumnIndex].Font.Size - 0.4f, e.Item.SubItems[e.ColumnIndex].Font.Style))
{
var c = ForeColor;
if (Configuration.Settings == null && Focused ||
Configuration.Settings != null && Focused && !Configuration.Settings.General.UseDarkTheme)
{
c = Color.White;
}
e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
var flags = TextFormatFlags.EndEllipsis | TextFormatFlags.Left | TextFormatFlags.TextBoxControl;
@ -479,7 +498,7 @@ namespace Nikse.SubtitleEdit.Controls
flags |= TextFormatFlags.RightToLeft;
}
TextRenderer.DrawText(e.Graphics, e.Item.SubItems[e.ColumnIndex].Text, f, new Rectangle(e.Bounds.Left + 3 + addX, e.Bounds.Top + 2, e.Bounds.Width - 7 - addX, e.Bounds.Height - 2), e.Item.ForeColor, flags);
TextRenderer.DrawText(e.Graphics, e.Item.SubItems[e.ColumnIndex].Text, f, new Rectangle(e.Bounds.Left + 3 + addX, e.Bounds.Top + 2, e.Bounds.Width - 7 - addX, e.Bounds.Height - 2), c, flags);
}
}
else

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

@ -5880,6 +5880,8 @@ namespace Nikse.SubtitleEdit.Forms
}
}
InitializeToolbar();
if (oldSubtitleTextBoxSyntaxColor != Configuration.Settings.General.SubtitleTextBoxSyntaxColor ||
oldSubtitleFontSize != Configuration.Settings.General.SubtitleTextBoxFontSize ||
oldSubtitleAlignment != Configuration.Settings.General.CenterSubtitleInTextBox ||
@ -5913,7 +5915,6 @@ namespace Nikse.SubtitleEdit.Forms
ShowLineInformationListView();
ShowSourceLineNumber();
LoadPlugins();
InitializeToolbar();
}
private void SetAudioVisualizerSettings()