From 2f768387f3849699320229a5b756db78af1207a2 Mon Sep 17 00:00:00 2001 From: tobigun 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/screens/UScreenCredits.pas | 6 ++--- src/screens/UScreenEditConvert.pas | 6 ++--- src/screens/UScreenEditSub.pas | 50 ++++++++++++++++++------------------ src/screens/UScreenOpen.pas | 10 ++++---- src/screens/UScreenOptionsRecord.pas | 2 +- src/screens/UScreenSingModi.pas | 4 ++- 6 files changed, 40 insertions(+), 38 deletions(-) (limited to 'src/screens') 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; -- cgit v1.2.3