Fix menu button graphics issue - again

This commit is contained in:
Dendraspis
2021-03-25 16:57:07 +01:00
parent 72e51b231a
commit c3da179d8f
3 changed files with 27 additions and 4 deletions
+3 -3
View File
@@ -1326,7 +1326,7 @@ Public Class Subtitle
Dim autoCode = p.PreferredSubtitles.ToLowerInvariant.SplitNoEmptyAndWhiteSpace(",", ";", " ")
Dim prefLang = autoCode.ContainsAny("all", st.Language.TwoLetterCode, st.Language.ThreeLetterCode)
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux AndAlso p.SubtitleMode <> SubtitleMode.Disabled
st.Enabled = prefLang AndAlso goodMode
st.IndexIDX = CInt(Regex.Match(line, ", index: (\d+)").Groups(1).Value)
@@ -1358,7 +1358,7 @@ Public Class Subtitle
Dim autoCode = p.PreferredSubtitles.ToLowerInvariant.SplitNoEmptyAndWhiteSpace(",", ";", " ")
Dim prefLang = autoCode.ContainsAny("all", st.Language.TwoLetterCode, st.Language.ThreeLetterCode)
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux AndAlso p.SubtitleMode <> SubtitleMode.Disabled
st.Enabled = prefLang AndAlso goodMode
st.Path = path
@@ -1387,7 +1387,7 @@ Public Class Subtitle
Dim autoCode = p.PreferredSubtitles.ToLowerInvariant.SplitNoEmptyAndWhiteSpace(",", ";", " ")
Dim prefLang = autoCode.ContainsAny("all", st.Language.TwoLetterCode, st.Language.ThreeLetterCode)
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux
Dim goodMode = p.SubtitleMode <> SubtitleMode.PreferredNoMux AndAlso p.SubtitleMode <> SubtitleMode.Disabled
st.Enabled = prefLang AndAlso goodMode
st.Path = path
+1 -1
View File
@@ -1437,7 +1437,7 @@ Namespace UI
For Each mi As MenuItemEx In Menu.Items
mi.AutoSize = False
mi.Width = minItemSize + 8
mi.Width = minItemSize + 16
Next
End Sub
+23
View File
@@ -726,12 +726,35 @@ Namespace UI
Sub New()
MyBase.New()
ApplyTheme()
AddHandler ThemeManager.CurrentThemeChanged, AddressOf OnThemeChanged
End Sub
Sub New(container As IContainer)
MyBase.New(container)
ApplyTheme()
AddHandler ThemeManager.CurrentThemeChanged, AddressOf OnThemeChanged
End Sub
Sub OnThemeChanged(theme As Theme)
ApplyTheme(theme)
End Sub
Sub ApplyTheme()
ApplyTheme(ThemeManager.CurrentTheme)
End Sub
Sub ApplyTheme(theme As Theme)
If DesignHelp.IsDesignMode Then
Exit Sub
End If
SuspendLayout()
BackColor = theme.General.Controls.ToolStrip.DropdownBackgroundDefaultColor
ResumeLayout()
End Sub
Protected Overrides Sub OnHandleCreated(e As EventArgs)
MyBase.OnHandleCreated(e)
g.SetRenderer(Me)