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

16 files changed, 161 insertions, 157 deletions

diff --git a/src/base/TextGL.pas b/src/base/TextGL.pas
index 03351adf..ad4c0ee2 100644
--- a/src/base/TextGL.pas
+++ b/src/base/TextGL.pas
@@ -359,7 +359,7 @@ end;
 
 procedure SetFontSize(Size: real);
 begin
-  Fonts[ActFont].Tex.H := 30 * (Size/10);
+  Fonts[ActFont].Tex.H := Size;
 end;
 
 procedure SetFontStyle(Style: integer);
diff --git a/src/base/UDraw.pas b/src/base/UDraw.pas
index a28543b8..61335a53 100644
--- a/src/base/UDraw.pas
+++ b/src/base/UDraw.pas
@@ -1222,7 +1222,7 @@ begin
 
 //Set Font Propertys
 SetFontStyle(2); //Font: Outlined1
-if Age < 5 then SetFontSize(Age + 1) else SetFontSize(6);
+if Age < 5 then SetFontSize((Age + 1) * 3) else SetFontSize(18);
 SetFontItalic(False);
 
 //Check Font Size
diff --git a/src/base/ULyrics.pas b/src/base/ULyrics.pas
index ece9f1d4..5c5449b1 100644
--- a/src/base/ULyrics.pas
+++ b/src/base/ULyrics.pas
@@ -463,7 +463,7 @@ begin
 
   // set font size to a reasonable value
   LyricLine.Height := RequestHeight * 0.9;
-  SetFontSize(LyricLine.Height/3);
+  SetFontSize(LyricLine.Height);
   LyricLine.Width := glTextWidth(PChar(LyricLine.Text));
 
   // change font-size to fit into the lyric bar
@@ -474,7 +474,7 @@ begin
     if (LyricLine.Height < 1) then
       LyricLine.Height := 1;
 
-    SetFontSize(LyricLine.Height/3);
+    SetFontSize(LyricLine.Height);
     LyricLine.Width := glTextWidth(PChar(LyricLine.Text));
   end;
 
@@ -539,7 +539,7 @@ begin
   // set font size and style
   SetFontStyle(FontStyle);
   ResetFont();
-  SetFontSize(Line.Height/3);
+  SetFontSize(Line.Height);
   glColor4f(1, 1, 1, 1);
 
   // center lyrics
diff --git a/src/base/USingScores.pas b/src/base/USingScores.pas
index 71ae2651..8e2455e1 100644
--- a/src/base/USingScores.pas
+++ b/src/base/USingScores.pas
@@ -93,19 +93,19 @@ type
     RBW: Real;     //Width of the Rating Bar
     RBH: Real;     //Height of the Rating Bar
 
-    TextX: Real;        //X Position of the Score Text
-    TextY: Real;        //Y Position of the Score Text
-    TextFont: Byte;     //Font of the Score Text
-    TextSize: Byte;     //Size of the Score Text
-
-    PUW: Real;          //Width of the LineBonus Popup
-    PUH: Real;          //Height of the LineBonus Popup
-    PUFont: Byte;       //Font for the PopUps
-    PUFontSize: Byte;   //FontSize for the PopUps
-    PUStartX: Real;     //X Start Position of the LineBonus Popup
-    PUStartY: Real;     //Y Start Position of the LineBonus Popup
-    PUTargetX: Real;    //X Target Position of the LineBonus Popup
-    PUTargetY: Real;    //Y Target Position of the LineBonus Popup
+    TextX: Real;         //X Position of the Score Text
+    TextY: Real;         //Y Position of the Score Text
+    TextFont: Byte;      //Font of the Score Text
+    TextSize: integer;   //Size of the Score Text
+
+    PUW: Real;           //Width of the LineBonus Popup
+    PUH: Real;           //Height of the LineBonus Popup
+    PUFont: Byte;        //Font for the PopUps
+    PUFontSize: integer; //FontSize for the PopUps
+    PUStartX: Real;      //X Start Position of the LineBonus Popup
+    PUStartY: Real;      //Y Start Position of the LineBonus Popup
+    PUTargetX: Real;     //X Target Position of the LineBonus Popup
+    PUTargetY: Real;     //Y Target Position of the LineBonus Popup
   end;
   aScorePosition = array[0..MaxPositions-1] of TScorePosition;
 
@@ -138,17 +138,17 @@ type
       FirstPopUp: PScorePopUp;
       LastPopUp:  PScorePopUp;
 
-      //Procedure Draws a Popup by Pointer
-      Procedure DrawPopUp(const PopUp: PScorePopUp);
+      // Draws a Popup by Pointer
+      procedure DrawPopUp(const PopUp: PScorePopUp);
 
-      //Procedure Draws a Score by Playerindex
-      Procedure DrawScore(const Index: Integer);
+      // Draws a Score by Playerindex
+      procedure DrawScore(const Index: Integer);
 
-      //Procedure Draws the RatingBar by Playerindex
-      Procedure DrawRatingBar(const Index: Integer);
+      // Draws the RatingBar by Playerindex
+      procedure DrawRatingBar(const Index: Integer);
 
-      //Procedure Removes a PopUp w/o destroying the List
-      Procedure KillPopUp(const last, cur: PScorePopUp);
+      // Removes a PopUp w/o destroying the List
+      procedure KillPopUp(const last, cur: PScorePopUp);
     public
       Settings: record //Record containing some Displaying Options
         Phase1Time: Real;     //time for Phase 1 to complete (in msecs)
@@ -158,7 +158,7 @@ type
         Phase3Time: Real;     //time for Phase 3 to complete (in msecs)
                               //The Fade out and Score adding
 
-        PopUpTex:   Array [0..8] of TTexture; //Textures for every Popup Rating
+        PopUpTex:  array [0..8] of TTexture; //Textures for every Popup Rating
 
         RatingBar_BG_Tex:   TTexture; //Rating Bar Texs
         RatingBar_FG_Tex:   TTexture;
@@ -171,44 +171,44 @@ type
       RBVisible: Boolean;  //Visibility of all Rating Bars
 
       //Propertys for Reading Position and Playercount
-      Property PositionCount: Byte read oPositionCount;
-      Property PlayerCount: Byte read oPlayerCount;
-      Property Players: aScorePlayer read aPlayers;
+      property PositionCount: Byte read oPositionCount;
+      property PlayerCount: Byte read oPlayerCount;
+      property Players: aScorePlayer read aPlayers;
 
       //Constructor just sets some standard Settings
-      Constructor Create;
+      constructor Create;
 
-      //Procedure Adds a Position to Array and Increases Position Count
-      Procedure AddPosition(const pPosition: PScorePosition);
+      // Adds a Position to Array and Increases Position Count
+      procedure AddPosition(const pPosition: PScorePosition);
 
-      //Procedure Adds a Player to Array and Increases Player Count
-      Procedure AddPlayer(const ScoreBG: TTexture; const Color: TRGB; const Score: Word = 0; const Enabled: Boolean = True; const Visible: Boolean = True);
+      // Adds a Player to Array and Increases Player Count
+      procedure AddPlayer(const ScoreBG: TTexture; const Color: TRGB; const Score: Word = 0; const Enabled: Boolean = True; const Visible: Boolean = True);
 
       //Change a Players Visibility, Enable
-      Procedure ChangePlayerVisibility(const Index: Byte; const pVisible: Boolean);
-      Procedure ChangePlayerEnabled(const Index: Byte; const pEnabled: Boolean);
+      procedure ChangePlayerVisibility(const Index: Byte; const pVisible: Boolean);
+      procedure ChangePlayerEnabled(const Index: Byte; const pEnabled: Boolean);
 
-      //Procedure Deletes all Player Information
-      Procedure ClearPlayers;
+      // Deletes all Player Information
+      procedure ClearPlayers;
 
-      //Procedure Deletes Positions and Playerinformation
-      Procedure Clear;
+      // Deletes Positions and Playerinformation
+      procedure Clear;
 
-      //Procedure Loads some Settings and the Positions from Theme
-      Procedure LoadfromTheme;
+      // Loads some Settings and the Positions from Theme
+      procedure LoadfromTheme;
 
-      //Procedure has to be called after Positions and Players have been added, before first call of Draw
+      // has to be called after Positions and Players have been added, before first call of Draw
       //It gives every Player a Score Position
-      Procedure Init;
+      procedure Init;
 
       //Spawns a new Line Bonus PopUp for the Player
-      Procedure SpawnPopUp(const PlayerIndex: Byte; const Rating: Byte; const Score: Word);
+      procedure SpawnPopUp(const PlayerIndex: Byte; const Rating: Byte; const Score: Word);
 
       //Removes all PopUps from Mem
-      Procedure KillAllPopUps;
+      procedure KillAllPopUps;
 
-      //Procedure Draws Scores and Linebonus PopUps
-      Procedure Draw;
+      // Draws Scores and Linebonus PopUps
+      procedure Draw;
   end;
 
 
@@ -220,9 +220,9 @@ uses SDL,
      UGraphic,
      TextGL;
 
-//-----------
-//Constructor just sets some standard Settings
-//-----------
+{**
+ * Sets some standard Settings
+ *}
 Constructor TSingScores.Create;
 begin
   inherited;
@@ -259,9 +259,9 @@ begin
   Settings.RatingBar_Bar_Tex.TexNum  := 0;
 end;
 
-//-----------
-//Procedure Adds a Position to Array and Increases Position Count
-//-----------
+{**
+ * Adds a Position to Array and Increases Position Count
+ *}
 Procedure TSingScores.AddPosition(const pPosition: PScorePosition);
 begin
   if (PositionCount < MaxPositions) then
@@ -272,9 +272,9 @@ begin
   end;
 end;
 
-//-----------
-//Procedure Adds a Player to Array and Increases Player Count
-//-----------
+{**
+ * Adds a Player to Array and Increases Player Count
+ *}
 Procedure TSingScores.AddPlayer(const ScoreBG: TTexture; const Color: TRGB; const Score: Word; const Enabled: Boolean; const Visible: Boolean);
 begin
   if (PlayerCount < MaxPlayers) then
@@ -294,46 +294,46 @@ begin
   end;
 end;
 
-//-----------
-//Change a Players Visibility
-//-----------
+{**
+ * Change a Players Visibility
+ *}
 Procedure TSingScores.ChangePlayerVisibility(const Index: Byte; const pVisible: Boolean);
 begin
   if (Index < MaxPlayers) then
     aPlayers[Index].Visible := pVisible;
 end;
 
-//-----------
-//Change Player Enabled
-//-----------
+{**
+ * Change Player Enabled
+ *}
 Procedure TSingScores.ChangePlayerEnabled(const Index: Byte; const pEnabled: Boolean);
 begin
   if (Index < MaxPlayers) then
     aPlayers[Index].Enabled := pEnabled;
 end;
 
-//-----------
-//Procedure Deletes all Player Information
-//-----------
-Procedure TSingScores.ClearPlayers;    
+{**
+ * Procedure Deletes all Player Information
+ *}
+Procedure TSingScores.ClearPlayers;
 begin
   KillAllPopUps;
   oPlayerCount := 0;
 end;
 
-//-----------
-//Procedure Deletes Positions and Playerinformation
-//-----------
-Procedure TSingScores.Clear; 
+{**
+ * Procedure Deletes Positions and Playerinformation
+ *}
+Procedure TSingScores.Clear;
 begin
   KillAllPopUps;
   oPlayerCount    := 0;
   oPositionCount  := 0;
 end;
 
-//-----------
-//Procedure Loads some Settings and the Positions from Theme
-//-----------
+{**
+ * Procedure Loads some Settings and the Positions from Theme
+ *}
 Procedure TSingScores.LoadfromTheme;
 var I: Integer;
   Procedure AddbyStatics(const PC: Byte; const ScoreStatic, SingBarStatic: TThemeStatic; ScoreText: TThemeText);
@@ -360,7 +360,7 @@ var I: Integer;
     nPosition.PUH := nPosition.BGH;
 
     nPosition.PUFont     := 2;
-    nPosition.PUFontSize := 6;
+    nPosition.PUFontSize := 18;
 
     nPosition.PUStartX := nPosition.BGX;
     nPosition.PUStartY := nPosition.TextY + 65;
@@ -398,9 +398,9 @@ begin
   AddByStatics(4, Theme.Sing.StaticP3RScoreBG, Theme.Sing.StaticP3SingBar, Theme.Sing.TextP3RScore);
 end;
 
-//-----------
-//Spawns a new Line Bonus PopUp for the Player
-//-----------
+{**
+ * Spawns a new Line Bonus PopUp for the Player
+ *}
 Procedure TSingScores.SpawnPopUp(const PlayerIndex: Byte; const Rating: Byte; const Score: Word);
 var Cur: PScorePopUp;
 begin
@@ -446,9 +446,9 @@ begin
     Log.LogError('TSingScores: Try to add PopUp for not existing player');
 end;
 
-//-----------
-// Removes a PopUp w/o destroying the List
-//-----------
+{**
+ * Removes a PopUp w/o destroying the List
+ *}
 Procedure TSingScores.KillPopUp(const last, cur: PScorePopUp);
 begin
   //Give Player the Last Points that missing till now
@@ -488,9 +488,9 @@ begin
   FreeMem(Cur, SizeOf(TScorePopUp));
 end;
 
-//-----------
-//Removes all PopUps from Mem
-//-----------
+{**
+ * Removes all PopUps from Mem
+ *}
 Procedure TSingScores.KillAllPopUps;
 var
   Cur:  PScorePopUp;
@@ -510,10 +510,10 @@ begin
   LastPopUp := nil;
 end;
 
-//-----------
-//Init - has to be called after Positions and Players have been added, before first call of Draw
-//It gives every Player a Score Position
-//-----------
+{**
+ * Has to be called after Positions and Players have been added, before first call of Draw
+ * It gives every Player a Score Position
+ *}
 Procedure TSingScores.Init;
 var
   PlC: Array [0..1] of Byte; //Playercount First Screen and Second Screen
@@ -602,9 +602,9 @@ begin
     end;
 end;
 
-//-----------
-//Procedure Draws Scores and Linebonus PopUps
-//-----------
+{**
+ * Draws Scores and Linebonus PopUps
+ *}
 Procedure TSingScores.Draw;
 var
   I: Integer;
@@ -655,15 +655,15 @@ begin
   end; //eo Visible
 end;
 
-//-----------
-//Procedure Draws a Popup by Pointer
-//-----------
+{**
+ * Draws a Popup by Pointer
+ *}
 Procedure TSingScores.DrawPopUp(const PopUp: PScorePopUp);
 var
   Progress: Real;
   CurTime:  Cardinal;
   X, Y, W, H, Alpha: Real;
-  FontSize: Byte;
+  FontSize: integer;
   FontOffset: Real;
   TimeDiff: Cardinal;
   PIndex:   Byte;
@@ -706,7 +706,7 @@ begin
           Y := Positions[PIndex].PUStartY + (Positions[PIndex].PUH - H)/2;
 
           FontSize   := Round(Progress * Positions[PIndex].PUFontSize);
-          FontOffset := H / 2 - FontSize;
+          FontOffset := (H  - FontSize) / 2;
           Alpha := 1;
         end
 
@@ -729,7 +729,7 @@ begin
           Y := Positions[PIndex].PUStartY + PosDiff * sqr(Progress);
 
           FontSize   := Positions[PIndex].PUFontSize;
-          FontOffset := H / 2 - FontSize;
+          FontOffset := (H - FontSize) / 2;
           Alpha := 1 - 0.3 * Progress;
         end
 
@@ -776,7 +776,7 @@ begin
             Y := Positions[PIndex].PUTargetY - PosDiff * (1-Progress);
 
             FontSize   := Positions[PIndex].PUFontSize;
-            FontOffset := H / 2 - FontSize;
+            FontOffset := (H - FontSize) / 2;
           end
           else
           begin
@@ -820,7 +820,7 @@ begin
           TextLen := glTextWidth(PChar(Theme.Sing.LineBonusText[PopUp.Rating]));
 
           //Color and Pos
-          SetFontPos (X + (W - TextLen) / 2, Y + FontOffset{12});
+          SetFontPos (X + (W - TextLen) / 2, Y + FontOffset);
           glColor4f(1, 1, 1, Alpha);
 
           //Draw
@@ -833,9 +833,9 @@ begin
     Log.LogError('TSingScores: Try to Draw a not existing PopUp');
 end;
 
-//-----------
-//Procedure Draws a Score by Playerindex
-//-----------
+{**
+ * Draws a Score by Playerindex
+ *}
 Procedure TSingScores.DrawScore(const Index: Integer);
 var
   Position: PScorePosition;
diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index 745a5d9b..02fdf10a 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -1526,7 +1526,8 @@ begin
   ThemeText.ColB  := ThemeIni.ReadFloat(Name, 'ColB', 0);
 
   ThemeText.Font  := ThemeIni.ReadInteger(Name, 'Font', 0);
-  ThemeText.Size  := ThemeIni.ReadInteger(Name, 'Size', 0);
+  // FIXME: FONTSIZE
+  ThemeText.Size  := ThemeIni.ReadInteger(Name, 'Size', 0) * 3;
   ThemeText.Align := ThemeIni.ReadInteger(Name, 'Align', 0);
 
   ThemeText.Text  := Language.Translate(ThemeIni.ReadString(Name, 'Text', ''));
@@ -1739,7 +1740,8 @@ begin
 
   ThemeSelectS.Z := ThemeIni.ReadFloat(Name, 'Z', 0);
 
-  ThemeSelectS.TextSize := ThemeIni.ReadInteger(Name, 'TextSize', 10);
+  // FIXME: FONTSIZE
+  ThemeSelectS.TextSize := ThemeIni.ReadInteger(Name, 'TextSize', 10) * 3;
 
   ThemeSelectS.SkipX := ThemeIni.ReadInteger(Name, 'SkipX', 0);
 
diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas
index 32484d5e..84949766 100644
--- a/src/media/UVideo.pas
+++ b/src/media/UVideo.pas
@@ -764,7 +764,7 @@ begin
     glColor4f(0.7, 1, 0.3, 1);
     SetFontStyle (1);
     SetFontItalic(False);
-    SetFontSize(9);
+    SetFontSize(27);
     SetFontPos (300, 0);
     glPrint('Delay due to negative VideoGap');
     glColor4f(1, 1, 1, 1);
@@ -783,7 +783,7 @@ begin
     glColor4f(1, 1, 1, 1);
     SetFontStyle (1);
     SetFontItalic(False);
-    SetFontSize(9);
+    SetFontSize(27);
     SetFontPos (5, 0);
     glPrint('delaying frame');
     SetFontPos (5, 20);
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);
diff --git a/src/screens/UScreenCredits.pas b/src/screens/UScreenCredits.pas
index 197fb076..fca65359 100644
--- a/src/screens/UScreenCredits.pas
+++ b/src/screens/UScreenCredits.pas
@@ -329,7 +329,7 @@ var
   X,Y,A: Real;
   visibleText: PChar;
 begin
-  SetFontSize(10);
+  SetFontSize(30);
   //Init ScrollingText
   if (CTime = Timings[7]) then
   begin
@@ -367,7 +367,7 @@ begin
     X:=5;
     SetFontStyle (2);
      SetFontItalic(False);
-     SetFontSize(9);
+     SetFontSize(27);
      glColor4f(1, 1, 1, 1);
      for S:=0 to high(CTime_hold) do begin
      visibleText:=pchar(inttostr(CTime_hold[S]));
@@ -1352,7 +1352,7 @@ begin
    // draw credits runtime counter
    SetFontStyle (2);
     SetFontItalic(False);
-    SetFontSize(9);
+    SetFontSize(27);
     SetFontPos (5, 5);
     glColor4f(1, 1, 1, 1);
     //RuntimeStr:='CTime: '+inttostr(floor(CTime/30.320663991914489602156136106092))+'.'+inttostr(floor(CTime/3.0320663991914489602156136106092)-floor(CTime/30.320663991914489602156136106092)*10);
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 4173fac2..9efa1a92 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -558,12 +558,12 @@ begin
   for Pet := 0 to High(ATrack) do begin
     if ((ATrack[Pet].Status div 1) and 1) = 1 then begin
       SetFontPos(25, Y + Pet*YSkip + 10);
-      SetFontSize(5);
+      SetFontSize(15);
       glPrint('N');
     end;
     if ((ATrack[Pet].Status div 2) and 1) = 1 then begin
       SetFontPos(40, Y + Pet*YSkip + 10);
-      SetFontSize(5);
+      SetFontSize(15);
       glPrint('L');
     end;
   end;
@@ -577,7 +577,7 @@ begin
 
   for Pet := 0 to High(ATrack) do begin
     SetFontPos(11, Y + 10 + Pet*YSkip);
-    SetFontSize(5);
+    SetFontSize(15);
     glPrint(pchar(ATrack[Pet].Name));
   end;
 
diff --git a/src/screens/UScreenEditSub.pas b/src/screens/UScreenEditSub.pas
index 09951e28..3eefc680 100644
--- a/src/screens/UScreenEditSub.pas
+++ b/src/screens/UScreenEditSub.pas
@@ -1115,30 +1115,30 @@ begin
   inherited Create;
   SetLength(Player, 1);
 
-  // linijka
+  // line
   AddStatic(20, 10, 80, 30, 0, 0, 0, Skin.GetTextureFileName('ButtonF'), TEXTURE_TYPE_COLORIZED);
-  AddText(40, 17, 1, 6, 1, 1, 1, 'Line');
-  TextSentence := AddText(120, 14, 1, 8, 0, 0, 0, '0 / 0');
+  AddText(40, 17, 1, 18, 1, 1, 1, 'Line');
+  TextSentence := AddText(120, 14, 1, 24, 0, 0, 0, '0 / 0');
 
   // Note
   AddStatic(220, 10, 80, 30, 0, 0, 0, Skin.GetTextureFileName('ButtonF'), TEXTURE_TYPE_COLORIZED);
-  AddText(242, 17, 1, 6, 1, 1, 1, 'Note');
-  TextNote := AddText(320, 14, 1, 8, 0, 0, 0, '0 / 0');
+  AddText(242, 17, 1, 18, 1, 1, 1, 'Note');
+  TextNote := AddText(320, 14, 1, 24, 0, 0, 0, '0 / 0');
 
   // file info
   AddStatic(150, 50, 500, 150, 0, 0, 0, Skin.GetTextureFileName('MainBar'), TEXTURE_TYPE_COLORIZED);
   AddStatic(151, 52, 498, 146,  1, 1, 1, Skin.GetTextureFileName('MainBar'), TEXTURE_TYPE_COLORIZED);
-  AddText(180, 65,  0, 8, 0, 0, 0, 'Title:');
-  AddText(180, 90,  0, 8, 0, 0, 0, 'Artist:');
-  AddText(180, 115, 0, 8, 0, 0, 0, 'Mp3:');
-  AddText(180, 140, 0, 8, 0, 0, 0, 'BPM:');
-  AddText(180, 165, 0, 8, 0, 0, 0, 'GAP:');
-
-  TextTitle :=  AddText(250, 65,  0, 8, 0, 0, 0, 'a');
-  TextArtist := AddText(250, 90,  0, 8, 0, 0, 0, 'b');
-  TextMp3 :=    AddText(250, 115, 0, 8, 0, 0, 0, 'c');
-  TextBPM :=    AddText(250, 140, 0, 8, 0, 0, 0, 'd');
-  TextGAP :=    AddText(250, 165, 0, 8, 0, 0, 0, 'e');
+  AddText(180, 65,  0, 24, 0, 0, 0, 'Title:');
+  AddText(180, 90,  0, 24, 0, 0, 0, 'Artist:');
+  AddText(180, 115, 0, 24, 0, 0, 0, 'Mp3:');
+  AddText(180, 140, 0, 24, 0, 0, 0, 'BPM:');
+  AddText(180, 165, 0, 24, 0, 0, 0, 'GAP:');
+
+  TextTitle :=  AddText(250, 65,  0, 24, 0, 0, 0, 'a');
+  TextArtist := AddText(250, 90,  0, 24, 0, 0, 0, 'b');
+  TextMp3 :=    AddText(250, 115, 0, 24, 0, 0, 0, 'c');
+  TextBPM :=    AddText(250, 140, 0, 24, 0, 0, 0, 'd');
+  TextGAP :=    AddText(250, 165, 0, 24, 0, 0, 0, 'e');
 
 {  AddInteraction(2, TextTitle);
   AddInteraction(2, TextArtist);
@@ -1147,15 +1147,15 @@ begin
   AddInteraction(2, TextGAP);}
 
   // note info
-  AddText(20, 190,  0, 8, 0, 0, 0, 'Start:');
-  AddText(20, 215,  0, 8, 0, 0, 0, 'Duration:');
-  AddText(20, 240,  0, 8, 0, 0, 0, 'Tone:');
-  AddText(20, 265,  0, 8, 0, 0, 0, 'Text:');
+  AddText(20, 190,  0, 24, 0, 0, 0, 'Start:');
+  AddText(20, 215,  0, 24, 0, 0, 0, 'Duration:');
+  AddText(20, 240,  0, 24, 0, 0, 0, 'Tone:');
+  AddText(20, 265,  0, 24, 0, 0, 0, 'Text:');
 
-  TextNStart :=   AddText(120, 190,  0, 8, 0, 0, 0, 'a');
-  TextNLength := AddText(120, 215,  0, 8, 0, 0, 0, 'b');
-  TextNTon :=     AddText(120, 240,  0, 8, 0, 0, 0, 'c');
-  TextNText :=    AddText(120, 265,  0, 8, 0, 0, 0, 'd');
+  TextNStart :=   AddText(120, 190,  0, 24, 0, 0, 0, 'a');
+  TextNLength :=  AddText(120, 215,  0, 24, 0, 0, 0, 'b');
+  TextNTon :=     AddText(120, 240,  0, 24, 0, 0, 0, 'c');
+  TextNText :=    AddText(120, 265,  0, 24, 0, 0, 0, 'd');
 
   // debug
   TextDebug :=  AddText(30, 550, 0, 8, 0, 0, 0, '');
@@ -1209,7 +1209,7 @@ begin
     Lyric.X := 400;
     Lyric.Y := 500;
     Lyric.Align := 1;
-    Lyric.Size := 14;
+    Lyric.Size := 42;
     Lyric.ColR := 0;
     Lyric.ColG := 0;
     Lyric.ColB := 0;
diff --git a/src/screens/UScreenOpen.pas b/src/screens/UScreenOpen.pas
index ee77f34e..116fd175 100644
--- a/src/screens/UScreenOpen.pas
+++ b/src/screens/UScreenOpen.pas
@@ -145,18 +145,18 @@ begin
 
   // linijka
 {  AddStatic(20, 10, 80, 30, 0, 0, 0, 'MainBar', 'JPG', TEXTURE_TYPE_COLORIZED);
-  AddText(35, 17, 1, 6, 1, 1, 1, 'Linijka');
-  TextSentence := AddText(120, 14, 1, 8, 0, 0, 0, '0 / 0');}
+  AddText(35, 17, 1, 18, 1, 1, 1, 'Linijka');
+  TextSentence := AddText(120, 14, 1, 24, 0, 0, 0, '0 / 0');}
 
   // file list
 //  AddBox(400, 100, 350, 450);
 
-//  TextF[0] :=  AddText(430, 155,  0, 8, 0, 0, 0, 'a');
-//  TextF[1] :=  AddText(430, 180,  0, 8, 0, 0, 0, 'a');
+//  TextF[0] :=  AddText(430, 155,  0, 24, 0, 0, 0, 'a');
+//  TextF[1] :=  AddText(430, 180,  0, 24, 0, 0, 0, 'a');
 
   // file name
   AddBox(20, 540, 500, 40);
-  TextN := AddText(50, 548, 0, 8, 0, 0, 0, ConversionFileName);
+  TextN := AddText(50, 548, 0, 24, 0, 0, 0, ConversionFileName);
   AddInteraction(iText, TextN);
 
   // buttons
diff --git a/src/screens/UScreenOptionsRecord.pas b/src/screens/UScreenOptionsRecord.pas
index 8670d23f..541400fd 100644
--- a/src/screens/UScreenOptionsRecord.pas
+++ b/src/screens/UScreenOptionsRecord.pas
@@ -723,7 +723,7 @@ begin
 
   // initialize font
   // TODO: what about reflection, italic etc.?
-  SetFontSize(ToneStringHeight/3);
+  SetFontSize(ToneStringHeight);
 
   // center
   // Note: for centering let us assume that G#4 has the max. horizontal extent
diff --git a/src/screens/UScreenSingModi.pas b/src/screens/UScreenSingModi.pas
index 948dc29c..1002b964 100644
--- a/src/screens/UScreenSingModi.pas
+++ b/src/screens/UScreenSingModi.pas
@@ -686,7 +686,9 @@ procedure Print(const Style, Size: Byte; const X, Y: Real; const Text: PChar); s
 begin
   SetFontItalic ((Style and 128) = 128);
   SetFontStyle(Style and 7);
-  SetFontSize(Size);
+  // FIXME: FONTSIZE
+  // used by Hold_The_Line / TeamDuell
+  SetFontSize(Size * 3);
   SetFontPos (X, Y);
   glPrint (PChar(Language.Translate(String(Text))));
 end;