aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-16 18:18:37 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-05-16 18:18:37 +0000
commit9b29c5321e423fbe6ba29f32bdcf8f2c83828e92 (patch)
tree476a90802972f3f41d5c1e9820a5e6384ab49e93
parentcabc484d29e9406ea55b043d2802f9a3771dfee3 (diff)
downloadusdx-9b29c5321e423fbe6ba29f32bdcf8f2c83828e92.tar.gz
usdx-9b29c5321e423fbe6ba29f32bdcf8f2c83828e92.tar.xz
usdx-9b29c5321e423fbe6ba29f32bdcf8f2c83828e92.zip
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
-rw-r--r--Game/Code/Classes/UThemes.pas8
-rw-r--r--Game/Code/Menu/UMenu.pas7
-rw-r--r--Game/Code/Menu/UMenuSelectSlide.pas4
-rw-r--r--Skins/Deluxe/Autum.ini1
-rw-r--r--Skins/Deluxe/Blue.ini1
-rw-r--r--Skins/Deluxe/Summer.ini1
-rw-r--r--Skins/Deluxe/Winter.ini1
-rw-r--r--Skins/Deluxe/[menu]songMenuSelectBg.jpgbin0 -> 1674 bytes
-rw-r--r--Themes/Deluxe.ini13
9 files changed, 26 insertions, 10 deletions
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
diff --git a/Skins/Deluxe/Autum.ini b/Skins/Deluxe/Autum.ini
index a43c15db..e225c612 100644
--- a/Skins/Deluxe/Autum.ini
+++ b/Skins/Deluxe/Autum.ini
@@ -125,6 +125,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+SongMenuSelectBG = [menu]songMenuSelectBg.jpg
PopUpBG = [menu]popUpBG.jpg
diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index e9cdde00..1dc9f2c5 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -125,6 +125,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+SongMenuSelectBG = [menu]songMenuSelectBg.jpg
PopUpBG = [menu]popUpBG.jpg
diff --git a/Skins/Deluxe/Summer.ini b/Skins/Deluxe/Summer.ini
index 22443050..3ad90e12 100644
--- a/Skins/Deluxe/Summer.ini
+++ b/Skins/Deluxe/Summer.ini
@@ -125,6 +125,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+SongMenuSelectBG = [menu]songMenuSelectBg.jpg
PopUpBG = [menu]popUpBG.jpg
diff --git a/Skins/Deluxe/Winter.ini b/Skins/Deluxe/Winter.ini
index 518f234c..2404f889 100644
--- a/Skins/Deluxe/Winter.ini
+++ b/Skins/Deluxe/Winter.ini
@@ -123,6 +123,7 @@ Leiste2 = [special]bar2.jpg
JumpToBG = [menu]jumpToBg.jpg
SongMenuBG = [menu]songMenuBg.jpg
+SongMenuSelectBG = [menu]songMenuSelectBg.jpg
PopUpBG = [menu]popUpBG.jpg
# # # N O T E S # # #
diff --git a/Skins/Deluxe/[menu]songMenuSelectBg.jpg b/Skins/Deluxe/[menu]songMenuSelectBg.jpg
new file mode 100644
index 00000000..79966f3b
--- /dev/null
+++ b/Skins/Deluxe/[menu]songMenuSelectBg.jpg
Binary files differ
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index ed92ae3c..a355fa86 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -6942,24 +6942,23 @@ Z=1
[SongMenuSelectSlide3]
Tex = Rectangle
-TexSBG = Rectangle
-Color =LightBlue
-DColor = DarkBlue
+TexSBG = SongMenuSelectBG
Text =
X = 460
-Y = 195
-Z = 0.99
+Y = 225
W = 0
H = 25
+Z = 0.99
SkipX = 0
+SBGW=270
-SBGW = 270
+TextSize=8
Color = LightBlue
DColor = DarkBlue
TColor = White
TDColor = White
-SBGTex = Rectangle
+SBGTex = MainBar
SBGColor = LightBlue
SBGDColor = DarkBlue
STColor = White