mirror of
https://github.com/staxrip/staxrip.git
synced 2026-10-28 21:47:41 +08:00
Fix menu button graphics issue - again
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user