From 4f8afae1ce76884c54d4b2de9de2186e29115c57 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 16 May 2009 22:04:15 +0000
Subject: add lyric-bar bounds to theme thx to Krueger

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1746 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/UDraw.pas    |  2 +-
 src/base/UGraphic.pas | 11 -----------
 src/base/UThemes.pas  | 18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'src/base')

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');
-- 
cgit v1.2.3