diff options
Diffstat (limited to '')
| -rw-r--r-- | game/themes/Classic.ini | 17 | ||||
| -rw-r--r-- | game/themes/Deluxe.ini | 17 | ||||
| -rw-r--r-- | src/base/UDraw.pas | 2 | ||||
| -rw-r--r-- | src/base/UGraphic.pas | 11 | ||||
| -rw-r--r-- | src/base/UThemes.pas | 18 | ||||
| -rw-r--r-- | src/screens/UScreenSing.pas | 4 |
6 files changed, 51 insertions, 18 deletions
diff --git a/game/themes/Classic.ini b/game/themes/Classic.ini index 144448f2..1ea83f5e 100644 --- a/game/themes/Classic.ini +++ b/game/themes/Classic.ini @@ -7457,4 +7457,19 @@ H =44 Z =1 Int=1 Color =Black -Type=Font Black
\ No newline at end of file +Type=Font Black + + +[SingLyricsUpperBar] +X = 80 +W = 640 +Y = 493 +H = 41 +;YOffSet (+/-) for the Sing-Indicator +IndicatorYOffset = 3 + +[SingLyricsLowerBar] +X = 80 +W = 640 +Y = 535 +H = 41
\ No newline at end of file diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini index 5f47c215..4cc6b24b 100644 --- a/game/themes/Deluxe.ini +++ b/game/themes/Deluxe.ini @@ -8150,7 +8150,6 @@ Text = OK Align = 1 Z = 1 - [PausePopUpStatic] Tex = Pause X = 0 @@ -8159,4 +8158,18 @@ W = 800 H = 600 Z = 0.95 Color = White -Type = Colorized
\ No newline at end of file +Type = Colorized + +[SingLyricsUpperBar] +X = 80 +W = 640 +Y = 493 +H = 41 +;YOffSet (+/-) for the Sing-Indicator +IndicatorYOffset = 3 + +[SingLyricsLowerBar] +X = 80 +W = 640 +Y = 535 +H = 41
\ No newline at end of file diff --git a/src/base/UDraw.pas b/src/base/UDraw.pas index 8a66d271..1783986f 100644 --- a/src/base/UDraw.pas +++ b/src/base/UDraw.pas @@ -638,7 +638,7 @@ begin // determine lyric help bar position and size Bounds.Left := MoveStartX + BarProgress * MoveDist; Bounds.Right := Bounds.Left + BarWidth; - Bounds.Top := Skin_LyricsT + 3; + Bounds.Top := Theme.LyricBar.IndicatorYOffset + Theme.LyricBar.UpperY ; Bounds.Bottom := Bounds.Top + BarHeight + 3; // draw lyric help bar diff --git a/src/base/UGraphic.pas b/src/base/UGraphic.pas index 17175d02..e7b3d695 100644 --- a/src/base/UGraphic.pas +++ b/src/base/UGraphic.pas @@ -232,17 +232,6 @@ const Skin_OscG = 0; Skin_OscB = 0; - // TODO: add to theme ini file - Skin_LyricsT = 493; - Skin_LyricsUpperX = 80; - Skin_LyricsUpperW = 640; - Skin_LyricsUpperY = Skin_LyricsT; - Skin_LyricsUpperH = 41; - Skin_LyricsLowerX = 80; - Skin_LyricsLowerW = 640; - Skin_LyricsLowerY = Skin_LyricsT + Skin_LyricsUpperH + 1; - Skin_LyricsLowerH = 41; - Skin_SpectrumT = 470; Skin_SpectrumBot = 570; Skin_SpectrumH = 100; diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas index 9bf858ed..4c5434f8 100644 --- a/src/base/UThemes.pas +++ b/src/base/UThemes.pas @@ -359,6 +359,11 @@ type PausePopUp: TThemeStatic; end; + TThemeLyricBar = record + IndicatorYOffset, UpperX, UpperW, UpperY, UpperH, + LowerX, LowerW, LowerY, LowerH : integer; + end; + TThemeScore = class(TThemeBasic) TextArtist: TThemeText; TextTitle: TThemeText; @@ -723,6 +728,7 @@ type Level: TThemeLevel; Song: TThemeSong; Sing: TThemeSing; + LyricBar: TThemeLyricBar; Score: TThemeScore; Top5: TThemeTop5; Options: TThemeOptions; @@ -1031,9 +1037,19 @@ begin ThemeLoadStatic(Song.StaticTeam3Joker5, 'SongStaticTeam3Joker5'); + //LyricBar asd + LyricBar.UpperX := ThemeIni.ReadInteger('SingLyricsUpperBar', 'X', 0); + LyricBar.UpperW := ThemeIni.ReadInteger('SingLyricsUpperBar', 'W', 0); + LyricBar.UpperY := ThemeIni.ReadInteger('SingLyricsUpperBar', 'Y', 0); + LyricBar.UpperH := ThemeIni.ReadInteger('SingLyricsUpperBar', 'H', 0); + LyricBar.IndicatorYOffset := ThemeIni.ReadInteger('SingLyricsUpperBar', 'IndicatorYOffset', 0); + LyricBar.LowerX := ThemeIni.ReadInteger('SingLyricsLowerBar', 'X', 0); + LyricBar.LowerW := ThemeIni.ReadInteger('SingLyricsLowerBar', 'W', 0); + LyricBar.LowerY := ThemeIni.ReadInteger('SingLyricsLowerBar', 'Y', 0); + LyricBar.LowerH := ThemeIni.ReadInteger('SingLyricsLowerBar', 'H', 0); + // Sing ThemeLoadBasic(Sing, 'Sing'); - //TimeBar mod ThemeLoadStatic(Sing.StaticTimeProgress, 'SingTimeProgress'); ThemeLoadText(Sing.TextTimeText, 'SingTimeText'); diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index c29c0e2c..4389352a 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -297,8 +297,8 @@ begin Static[StaticPausePopup].Visible := false; Lyrics := TLyricEngine.Create( - Skin_LyricsUpperX, Skin_LyricsUpperY, Skin_LyricsUpperW, Skin_LyricsUpperH, - Skin_LyricsLowerX, Skin_LyricsLowerY, Skin_LyricsLowerW, Skin_LyricsLowerH); + Theme.LyricBar.UpperX, Theme.LyricBar.UpperY, Theme.LyricBar.UpperW, Theme.LyricBar.UpperH, + Theme.LyricBar.LowerX, Theme.LyricBar.LowerY, Theme.LyricBar.LowerW, Theme.LyricBar.LowerH); LyricsSync := TLyricsSyncSource.Create(); end; |