pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Implemented multi line support

Browse Source 
Some formatting improvements
Added fpdoc path to project file

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2214 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blaszijk
2012-01-02 12:38:10 +00:00
parent fe9496f340
commit d5f6141f4c
2 changed files with 100 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/nvidia-widgets/src/nvwidgets/examples/example.lpi
View File

@ -13,6 +13,7 @@
<MainUnit Value="0"/>
<ResourceType Value="res"/>
</General>
<LazDoc Paths="..\..\..\doc"/>
<i18n>
<EnableI18N LFM="False"/>
</i18n>
@ -32,7 +33,7 @@
<FormatVersion Value="1"/>
</local>
</RunParams>
<Units Count="3">
<Units Count="5">
<Unit0>
<Filename Value="example.pp"/>
<IsPartOfProject Value="True"/>
@ -48,10 +49,20 @@
<IsPartOfProject Value="True"/>
<UnitName Value="nvShaderUtils"/>
</Unit2>
<Unit3>
<Filename Value="..\nvWidgets.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="nvWidgets"/>
</Unit3>
<Unit4>
<Filename Value="..\nvglutwidgets.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="nvGlutWidgets"/>
</Unit4>
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="10"/>
<Version Value="11"/>
<PathDelim Value="\"/>
<Target>
<Filename Value="example"/>
@ -69,9 +80,9 @@
</Parsing>
<Linking>
<Debugging>
<UseLineInfoUnit Value="False"/>
<DebugInfoType Value="dsStabs"/>
<UseHeaptrc Value="True"/>
</Debugging>
<LinkSmart Value="True"/>
</Linking>
<Other>
<CompilerMessages>

177
components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas
View File

@ -803,25 +803,34 @@ var
w: integer;
wLine: integer;
i: integer;
s: TStrings;
t: string;
j: Integer;
begin
w := 0;
wLine := 0;
nbLines := 1;
s := TStringList.Create;
for i := 1 to length(Text) do
begin
if (Text[i] <> #13) and (Text[i + 1] <> #10) then
wLine := wLine + glutBitmapWidth(GLUT_BITMAP_HELVETICA_12, Ord(Text[i]))
else
try
s.Text:= Text;
w := 0;
wLine := 0;
nbLines := s.Count;
for i := 0 to nbLines - 1 do
begin
Inc(nbLines);
w := max(w, wLine);
wLine := 0;
t := s[i];
for j := 1 to Length(t) do
wLine := wLine + glutBitmapWidth(GLUT_BITMAP_HELVETICA_12, Ord(t[j]));
w := Max(w, wLine);
end;
finally
s.Free;
end;
w := max(w, wLine) + 2;
Result := w;
Result := Max(w, wLine) + 2;
end;
function GLUIPainter.getTextLineWidthAt(const Text: string; charNb: integer): integer;
@ -923,42 +932,24 @@ end;
procedure GLUIPainter.drawString(x: integer; y: integer; Text: string; nbLines: integer);
var
endNb: integer;
startNb: integer;
textOri: string;
lineNb: integer;
s: TStrings;
t: string;
i: Integer;
begin
glListBase(m_textListBase);
if nbLines < 2 then
begin
glRasterPos2i(x + 1, y + 4);
glCallLists(Length(Text), GL_UNSIGNED_BYTE, @Text[1]);
end
else
begin
lineNb := nbLines;
startNb := 0;
endNb := 0;
s := TStringList.Create;
try
s.Text := Text;
textOri := Text;
{$note fix multiline support, use TStrings instead of array of string}
//while lineNb <>0 do
//begin
// if {*}text^<>#0)and( *text<>#13#10 then
// begin
// inc(endNb);
// end
// else
// begin
// dec(lineNb);
// glRasterPos2i(x+1,y+4+lineNb*getFontHeight);
// glCallLists(endNb-startNb,GL_UNSIGNED_BYTE,textOri+startNb);
// inc(endNb);
// startNb:= endNb;
// end;
// inc(text);
//end;
for i := 0 to s.Count - 1 do
begin
t := s[s.Count - 1 - i];
glRasterPos2i(x + 1, y + 4 + i * getFontHeight);
glCallLists(Length(t), GL_UNSIGNED_BYTE, @t[1]);
end;
finally
s.Free;
end;
end;
@ -1023,67 +1014,69 @@ begin
y3 := aRect.y + aRect.h;
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(xb, yb);
glVertex2f(x0, y0);
glTexCoord2f(0, yb);
glVertex2f(x1, y0);
glTexCoord2f(xb, yb);
glVertex2f(x0, y0);
glTexCoord2f(0, yb);
glVertex2f(x1, y0);
glTexCoord2f(xb, 0);
glVertex2f(x0, y1);
glTexCoord2f(0, 0);
glVertex2f(x1, y1);
glTexCoord2f(xb, 0);
glVertex2f(x0, y1);
glTexCoord2f(0, 0);
glVertex2f(x1, y1);
glTexCoord2f(xb, 0);
glVertex2f(x0, y2);
glTexCoord2f(0, 0);
glVertex2f(x1, y2);
glTexCoord2f(xb, 0);
glVertex2f(x0, y2);
glTexCoord2f(0, 0);
glVertex2f(x1, y2);
glTexCoord2f(xb, yb);
glVertex2f(x0, y3);
glTexCoord2f(0, yb);
glVertex2f(x1, y3);
glTexCoord2f(xb, yb);
glVertex2f(x0, y3);
glTexCoord2f(0, yb);
glVertex2f(x1, y3);
glEnd;
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0, yb);
glVertex2f(x2, y0);
glTexCoord2f(xb, yb);
glVertex2f(x3, y0);
glTexCoord2f(0, yb);
glVertex2f(x2, y0);
glTexCoord2f(xb, yb);
glVertex2f(x3, y0);
glTexCoord2f(0, 0);
glVertex2f(x2, y1);
glTexCoord2f(xb, 0);
glVertex2f(x3, y1);
glTexCoord2f(0, 0);
glVertex2f(x2, y1);
glTexCoord2f(xb, 0);
glVertex2f(x3, y1);
glTexCoord2f(0, 0);
glVertex2f(x2, y2);
glTexCoord2f(xb, 0);
glVertex2f(x3, y2);
glTexCoord2f(0, 0);
glVertex2f(x2, y2);
glTexCoord2f(xb, 0);
glVertex2f(x3, y2);
glTexCoord2f(0, yb);
glVertex2f(x2, y3);
glTexCoord2f(xb, yb);
glVertex2f(x3, y3);
glTexCoord2f(0, yb);
glVertex2f(x2, y3);
glTexCoord2f(xb, yb);
glVertex2f(x3, y3);
glEnd;
glBegin(GL_TRIANGLE_STRIP);
glTexCoord2f(0, yb);
glVertex2f(x1, y0);
glTexCoord2f(0, yb);
glVertex2f(x2, y0);
glTexCoord2f(0, yb);
glVertex2f(x1, y0);
glTexCoord2f(0, yb);
glVertex2f(x2, y0);
glTexCoord2f(0, 0);
glVertex2f(x1, y1);
glTexCoord2f(0, 0);
glVertex2f(x2, y1);
glTexCoord2f(0, 0);
glVertex2f(x1, y1);
glTexCoord2f(0, 0);
glVertex2f(x2, y1);
glTexCoord2f(0, 0);
glVertex2f(x1, y2);
glTexCoord2f(0, 0);
glVertex2f(x2, y2);
glTexCoord2f(0, 0);
glVertex2f(x1, y2);
glTexCoord2f(0, 0);
glVertex2f(x2, y2);
glTexCoord2f(0, yb);
glVertex2f(x1, y3);
glTexCoord2f(0, yb);
glVertex2f(x2, y3);
glTexCoord2f(0, yb);
glVertex2f(x1, y3);
glTexCoord2f(0, yb);
glVertex2f(x2, y3);
glEnd;
glUseProgram(0);