From 2f768387f3849699320229a5b756db78af1207a2 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 19 Oct 2008 16:24:59 +0000
Subject: The size given to TextGL.SetSize() now expresses the size in pixel
 (formerly it was 1/3 of the pixel-size). For theme and plugin compatibility
 the following functions multiply the size with 3: - UScreenSingModi.Print -
 TTheme.ThemeLoadText - TTheme.ThemeLoadSelectSlide

TODO: Convert the themes/plugins and remove the "*3"

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1459 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/menu/UDisplay.pas         |  2 +-
 src/menu/UMenu.pas            | 12 ++++++------
 src/menu/UMenuSelectSlide.pas |  2 +-
 src/menu/UMenuText.pas        |  8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/menu')

diff --git a/src/menu/UDisplay.pas b/src/menu/UDisplay.pas
index ebd25e50..bea9b58d 100644
--- a/src/menu/UDisplay.pas
+++ b/src/menu/UDisplay.pas
@@ -378,7 +378,7 @@ begin
 
   //Set Font Specs
   SetFontStyle(0);
-  SetFontSize(7);
+  SetFontSize(21);
   SetFontItalic(False);
   glColor4f(0, 0, 0, 1);
 
diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas
index c660b585..88f00e30 100644
--- a/src/menu/UMenu.pas
+++ b/src/menu/UMenu.pas
@@ -574,9 +574,9 @@ begin
   for BT := 0 to BTLen-1 do
   begin
       AddButtonText(ButtonCollection[Num], ThemeCollection.Style.Text[BT].X, ThemeCollection.Style.Text[BT].Y,
-      ThemeCollection.Style.Text[BT].ColR, ThemeCollection.Style.Text[BT].ColG, ThemeCollection.Style.Text[BT].ColB,
-      ThemeCollection.Style.Text[BT].Font, ThemeCollection.Style.Text[BT].Size, ThemeCollection.Style.Text[BT].Align,
-      ThemeCollection.Style.Text[BT].Text);
+        ThemeCollection.Style.Text[BT].ColR, ThemeCollection.Style.Text[BT].ColG, ThemeCollection.Style.Text[BT].ColB,
+        ThemeCollection.Style.Text[BT].Font, ThemeCollection.Style.Text[BT].Size, ThemeCollection.Style.Text[BT].Align,
+        ThemeCollection.Style.Text[BT].Text);
   end;
 end;
 
@@ -1269,7 +1269,7 @@ begin
   SelectsS[S].Text.X := X + 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.Size := 30;
   SelectsS[S].Text.Visible := true;
   SelectsS[S].TColR := TColR;
   SelectsS[S].TColG := TColG;
@@ -1303,7 +1303,7 @@ begin
   SelectsS[S].PData := @Data;
   // Configures Select options
   {//SelectsS[S].TextOpt[0].Text := IntToStr(I+1);
-  SelectsS[S].TextOpt[0].Size := 10;
+  SelectsS[S].TextOpt[0].Size := 30;
   SelectsS[S].TextOpt[0].Align := 1;
 
   SelectsS[S].TextOpt[0].ColR := SelectsS[S].STDColR;
@@ -1324,7 +1324,7 @@ begin
     SelectsS[S].TextOpt[I].X := SelectsS[S].TextureSBG.X + 20 + (50 + 20) + (150 - 20) * I;
     SelectsS[S].TextOpt[I].Y := SelectsS[S].TextureSBG.Y + 20;
     SelectsS[S].TextOpt[I].Text := IntToStr(I+1);
-    SelectsS[S].TextOpt[I].Size := 10;
+    SelectsS[S].TextOpt[I].Size := 30;
     SelectsS[S].TextOpt[I].Align := 1;
 
     SelectsS[S].TextOpt[I].ColR := SelectsS[S].STDColR;
diff --git a/src/menu/UMenuSelectSlide.pas b/src/menu/UMenuSelectSlide.pas
index 4779094c..ed1db6cf 100644
--- a/src/menu/UMenuSelectSlide.pas
+++ b/src/menu/UMenuSelectSlide.pas
@@ -370,7 +370,7 @@ begin
       else
         TextOpt[I].X := TextureSBG.X + TextureSBG.W - maxlength;
 
-      TextOpt[I].Y := TextureSBG.Y + (TextureSBG.H / 2) - 1.5 * Text.Size{20};
+      TextOpt[I].Y := TextureSBG.Y + (TextureSBG.H - Text.Size) / 2;
 
       //Better Look with 2 Options
       if (Lines=2) AND (Length(TextOptT)= 2) then
diff --git a/src/menu/UMenuText.pas b/src/menu/UMenuText.pas
index bc3d5ebd..1a7c15a1 100644
--- a/src/menu/UMenuText.pas
+++ b/src/menu/UMenuText.pas
@@ -328,12 +328,12 @@ begin
         glPrint(PChar(Text2));
 
         {if Size >= 10 then
-          Y2 := Y2 + Size * 2.8
+          Y2 := Y2 + Size * 0.93
         else}
         if (Style = 1) then
-          Y2 := Y2 + Size * 2.8
+          Y2 := Y2 + Size * 0.93
         else
-          Y2 := Y2 + Size * 2.15;
+          Y2 := Y2 + Size * 0.72;
       end;
       SetFontStyle(0); // reset to default
 
@@ -348,7 +348,7 @@ end;
 
 constructor TText.Create(X, Y: real; Tekst: string);
 begin
-  Create(X, Y, 0, 0, 10, 0, 0, 0, 0, Tekst, false, 0, 0);
+  Create(X, Y, 0, 0, 30, 0, 0, 0, 0, Tekst, false, 0, 0);
 end;
 
 constructor TText.Create(ParX, ParY, ParW: real; ParStyle: integer; ParSize, ParColR, ParColG, ParColB: real; ParAlign: integer; ParTekst: string; ParReflection: boolean; ParReflectionSpacing: real; ParZ:real);
-- 
cgit v1.2.3