From 9b29c5321e423fbe6ba29f32bdcf8f2c83828e92 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 16 May 2007 18:18:37 +0000
Subject: Fixed text position of SelectSlide when High is not 70 Added ability
 to change Z and Textsize from SelectSlide Use new abilitys to finish SongMenu
 Screen in Deluxe Theme

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@196 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UThemes.pas       | 8 ++++++++
 Game/Code/Menu/UMenu.pas            | 7 ++++++-
 Game/Code/Menu/UMenuSelectSlide.pas | 4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'Game')

diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index d3358440..b9183740 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -186,6 +186,9 @@ type
     Y:      integer;
     W:      integer;
     H:      integer;
+    Z:      real;
+
+    TextSize:   integer;
     
     //SBGW Mod
     SBGW:   integer;
@@ -1717,6 +1720,11 @@ begin
   ThemeSelectS.Y := ThemeIni.ReadInteger(Name, 'Y', 0);
   ThemeSelectS.W := ThemeIni.ReadInteger(Name, 'W', 0);
   ThemeSelectS.H := ThemeIni.ReadInteger(Name, 'H', 0);
+
+  ThemeSelectS.Z := ThemeIni.ReadFloat(Name, 'Z', 0);
+
+  ThemeSelectS.TextSize := ThemeIni.ReadInteger(Name, 'TextSize', 10);
+
   ThemeSelectS.SkipX := ThemeIni.ReadInteger(Name, 'SkipX', 0);
 
   ThemeSelectS.SBGW := ThemeIni.ReadInteger(Name, 'SBGW', 450);
diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas
index c9d3c726..d7c919ee 100644
--- a/Game/Code/Menu/UMenu.pas
+++ b/Game/Code/Menu/UMenu.pas
@@ -1102,6 +1102,11 @@ begin
   for SO := 0 to High(Values) do
     AddSelectSlideOption(Values[SO]);
 
+  SelectsS[High(SelectsS)].Text.Size := ThemeSelectS.TextSize;
+
+  SelectsS[High(SelectsS)].Texture.Z := ThemeSelectS.Z;
+  SelectsS[High(SelectsS)].TextureSBG.Z := ThemeSelectS.Z;
+
   //Generate Lines
   SelectsS[High(SelectsS)].GenLines;
 
@@ -1153,7 +1158,7 @@ begin
   SelectsS[S].SBGDInt := SBGDInt;
 
   SelectsS[S].Text.X := X + 20;
-  SelectsS[S].Text.Y := Y + 20;
+  SelectsS[S].Text.Y := Y + (SelectsS[S].TextureSBG.H / 2) - 15;
   SelectsS[S].Text.Text := Caption;
   SelectsS[S].Text.Size := 10;
   SelectsS[S].Text.Visible := true;
diff --git a/Game/Code/Menu/UMenuSelectSlide.pas b/Game/Code/Menu/UMenuSelectSlide.pas
index 9885acc0..0149ea2b 100644
--- a/Game/Code/Menu/UMenuSelectSlide.pas
+++ b/Game/Code/Menu/UMenuSelectSlide.pas
@@ -315,7 +315,7 @@ begin
 
     //TextOpt[I] := TextOpt[0];
     TextOpt[I] := TText.Create;
-    TextOpt[I].Size := 10;
+    TextOpt[I].Size := Text.Size;
     //TextOpt[I].Align := 1;
     TextOpt[I].Align := 0;
     TextOpt[I].Visible := True;
@@ -328,7 +328,7 @@ begin
     //Generate Positions
     //TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W  / Lines) * (I + 0.5);
     TextOpt[I].X := TextureSBG.X + 20 + (TextureSBG.W  / Lines) * I;
-    TextOpt[I].Y := TextureSBG.Y + 20;
+    TextOpt[I].Y := TextureSBG.Y + (TextureSBG.H / 2) - 1.5 * Text.Size{20};
 
     //Better Look with 2 Options
     if (Lines=2) AND (Length(TextOptT)= 2) then
-- 
cgit v1.2.3