diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-3.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-3.html index ba9503bff..600a4e566 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-3.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-3.html @@ -27,6 +27,11 @@

Print

+ +

 

+ +

TextWidth

+ diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-4.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-4.html index 48899ec39..e160ff85a 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-4.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont-4.html @@ -23,6 +23,11 @@

Print (TGLFreeTypeFont)

+ +

 

+

+

TextWidth (TGLFreeTypeFont)

+ diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html index c3a19dd05..d7df3ac5f 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.clean.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.Clean

Declaration

-

Source position: glfreetype.pas line 28

+

Source position: glfreetype.pas line 31

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html index 5e5d5b4d9..f4bfa4e60 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.height.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.Height

Declaration

-

Source position: glfreetype.pas line 19

+

Source position: glfreetype.pas line 22

procedure TGLFreeTypeFont.Clean;
diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html index aa9f8c4b8..0bc49e57d 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.html @@ -17,7 +17,7 @@

[Properties (by Name)] [Methods (by Name)] [Events (by Name)]

Declaration

-

Source position: glfreetype.pas line 18

+

Source position: glfreetype.pas line 21

TGLFreeTypeFont.Height: Cardinal;
@@ -41,6 +41,9 @@ + + +

type TGLFreeTypeFont = object

  procedure Print();

  function TextWidth();

end;
diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html index d41e2d902..663d396b2 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.init.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.Init

Declaration

-

Source position: glfreetype.pas line 25

+

Source position: glfreetype.pas line 28

diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html index c36206eab..5b9977dbf 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.list_base.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.list_base

Declaration

-

Source position: glfreetype.pas line 21

+

Source position: glfreetype.pas line 24

procedure TGLFreeTypeFont.Init(
diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html index 2a2e87d4e..c666b29ba 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.print.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.Print

Declaration

-

Source position: glfreetype.pas line 33

+

Source position: glfreetype.pas line 36

TGLFreeTypeFont.list_base: GLuint;
diff --git a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html index c7d9f6d56..e66eb7342 100644 --- a/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html +++ b/components/nvidia-widgets/doc/glfreetype/tglfreetypefont.textures.html @@ -16,7 +16,7 @@

TGLFreeTypeFont.textures

Declaration

-

Source position: glfreetype.pas line 20

+

Source position: glfreetype.pas line 23

procedure TGLFreeTypeFont.Print(
diff --git a/components/nvidia-widgets/doc/images/button.png b/components/nvidia-widgets/doc/images/button.png index b05ab237f..d7b4f9eba 100644 Binary files a/components/nvidia-widgets/doc/images/button.png and b/components/nvidia-widgets/doc/images/button.png differ diff --git a/components/nvidia-widgets/doc/images/checkbutton.png b/components/nvidia-widgets/doc/images/checkbutton.png index d3f71a609..d18d9e197 100644 Binary files a/components/nvidia-widgets/doc/images/checkbutton.png and b/components/nvidia-widgets/doc/images/checkbutton.png differ diff --git a/components/nvidia-widgets/doc/images/combobox.png b/components/nvidia-widgets/doc/images/combobox.png index 07cca291b..293997d24 100644 Binary files a/components/nvidia-widgets/doc/images/combobox.png and b/components/nvidia-widgets/doc/images/combobox.png differ diff --git a/components/nvidia-widgets/doc/images/crop_images.bat b/components/nvidia-widgets/doc/images/crop_images.bat index 92a016d8e..62850c377 100644 --- a/components/nvidia-widgets/doc/images/crop_images.bat +++ b/components/nvidia-widgets/doc/images/crop_images.bat @@ -3,15 +3,21 @@ ::a separate file ::the crop application is located in ./utils -crop widget_test.png 7 30 150 70 label.png -crop widget_test.png 7 70 170 100 button.png -crop widget_test.png 7 100 385 162 checkbutton.bmp -crop widget_test.png 7 162 375 222 radiobutton.bmp -crop widget_test.png 7 222 120 252 horizontal_slider.png -crop widget_test.png 7 252 108 309 listbox.png -crop widget_test.png 104 252 233 309 combobox.png -crop widget_test.png 7 309 235 340 line_edit.png -crop widget_test.png 7 340 242 407 panel.png -crop widget_test.png 7 414 242 480 frame.png -crop widget_test.png 4 478 74 542 listitem.png -crop widget_test.png 4 540 112 649 textureview.bmp \ No newline at end of file +crop widget_test.png 7 32 152 79 label.png +crop widget_test.png 7 79 182 109 button.png +crop widget_test.png 7 121 406 180 checkbutton.bmp +crop widget_test.png 7 190 394 251 radiobutton.bmp +crop widget_test.png 7 249 117 279 horizontal_slider.png +crop widget_test.png 7 279 118 348 listbox.png +crop widget_test.png 116 279 255 348 combobox.png +crop widget_test.png 7 348 235 383 line_edit.png +crop widget_test.png 7 383 262 458 panel.png +crop widget_test.png 7 458 262 537 frame.png +crop widget_test.png 4 537 75 618 listitem.png +crop widget_test.png 4 615 114 724 textureview.bmp + +del checkbutton.bmp +del radiobutton.bmp +del textureview.bmp + +ren *.bmp *.png diff --git a/components/nvidia-widgets/doc/images/frame.png b/components/nvidia-widgets/doc/images/frame.png index 5a6d9b7cd..b222b6f85 100644 Binary files a/components/nvidia-widgets/doc/images/frame.png and b/components/nvidia-widgets/doc/images/frame.png differ diff --git a/components/nvidia-widgets/doc/images/horizontal_slider.png b/components/nvidia-widgets/doc/images/horizontal_slider.png index 4086f79b3..442ae7a31 100644 Binary files a/components/nvidia-widgets/doc/images/horizontal_slider.png and b/components/nvidia-widgets/doc/images/horizontal_slider.png differ diff --git a/components/nvidia-widgets/doc/images/label.png b/components/nvidia-widgets/doc/images/label.png index 8e29077c5..6cd752ece 100644 Binary files a/components/nvidia-widgets/doc/images/label.png and b/components/nvidia-widgets/doc/images/label.png differ diff --git a/components/nvidia-widgets/doc/images/line_edit.png b/components/nvidia-widgets/doc/images/line_edit.png index 2e0f17a25..06232fb42 100644 Binary files a/components/nvidia-widgets/doc/images/line_edit.png and b/components/nvidia-widgets/doc/images/line_edit.png differ diff --git a/components/nvidia-widgets/doc/images/listbox.png b/components/nvidia-widgets/doc/images/listbox.png index a6d8ba3c5..391fd0472 100644 Binary files a/components/nvidia-widgets/doc/images/listbox.png and b/components/nvidia-widgets/doc/images/listbox.png differ diff --git a/components/nvidia-widgets/doc/images/listitem.png b/components/nvidia-widgets/doc/images/listitem.png index 035d683fe..d273fa407 100644 Binary files a/components/nvidia-widgets/doc/images/listitem.png and b/components/nvidia-widgets/doc/images/listitem.png differ diff --git a/components/nvidia-widgets/doc/images/nvwidgets.png b/components/nvidia-widgets/doc/images/nvwidgets.png index 033175d4f..5e995854c 100644 Binary files a/components/nvidia-widgets/doc/images/nvwidgets.png and b/components/nvidia-widgets/doc/images/nvwidgets.png differ diff --git a/components/nvidia-widgets/doc/images/panel.png b/components/nvidia-widgets/doc/images/panel.png index 2ac125a9b..e0da41066 100644 Binary files a/components/nvidia-widgets/doc/images/panel.png and b/components/nvidia-widgets/doc/images/panel.png differ diff --git a/components/nvidia-widgets/doc/images/radiobutton.png b/components/nvidia-widgets/doc/images/radiobutton.png index 0e65af1de..0ab6a4514 100644 Binary files a/components/nvidia-widgets/doc/images/radiobutton.png and b/components/nvidia-widgets/doc/images/radiobutton.png differ diff --git a/components/nvidia-widgets/doc/images/textureview.png b/components/nvidia-widgets/doc/images/textureview.png index 890cd3f0c..e494629e6 100644 Binary files a/components/nvidia-widgets/doc/images/textureview.png and b/components/nvidia-widgets/doc/images/textureview.png differ diff --git a/components/nvidia-widgets/doc/nvglwidgets/cbase.html b/components/nvidia-widgets/doc/nvglwidgets/cbase.html index 526a286dc..767fdb59e 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cbase.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cbase.html @@ -16,7 +16,7 @@

cBase

Declaration

-

Source position: nvglwidgets.pas line 19

+

Source position: nvglwidgets.pas line 21

TGLFreeTypeFont.textures: pGLuint;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cbool.html b/components/nvidia-widgets/doc/nvglwidgets/cbool.html index 073ae54d8..0bb058e52 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cbool.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cbool.html @@ -16,7 +16,7 @@

cBool

Declaration

-

Source position: nvglwidgets.pas line 20

+

Source position: nvglwidgets.pas line 22

const cBase = 0;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cfont.html b/components/nvidia-widgets/doc/nvglwidgets/cfont.html index ae14baf5c..93d38c968 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cfont.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cfont.html @@ -16,7 +16,7 @@

cFont

Declaration

-

Source position: nvglwidgets.pas line 22

+

Source position: nvglwidgets.pas line 24

const cBool = 4;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cfontback.html b/components/nvidia-widgets/doc/nvglwidgets/cfontback.html index 0c8b842a6..5c1224e05 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cfontback.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cfontback.html @@ -16,7 +16,7 @@

cFontBack

Declaration

-

Source position: nvglwidgets.pas line 23

+

Source position: nvglwidgets.pas line 25

const cFont = 12;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html b/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html index 0bbbb130b..b10500bef 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cnbcolors.html @@ -16,7 +16,7 @@

cNbColors

Declaration

-

Source position: nvglwidgets.pas line 25

+

Source position: nvglwidgets.pas line 27

const cFontBack = 16;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/coutline.html b/components/nvidia-widgets/doc/nvglwidgets/coutline.html index bde2f4725..55bbf3c6b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/coutline.html +++ b/components/nvidia-widgets/doc/nvglwidgets/coutline.html @@ -16,7 +16,7 @@

cOutline

Declaration

-

Source position: nvglwidgets.pas line 21

+

Source position: nvglwidgets.pas line 23

const cNbColors = 24;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html b/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html index 280e7031b..af385d558 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/ctexviewwidgetfssource.html @@ -16,7 +16,7 @@

cTexViewWidgetFSSource

Declaration

-

Source position: nvglwidgets.pas line 96

+

Source position: nvglwidgets.pas line 98

const cOutline = 8;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html b/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html index d015bc89e..dc148120b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html +++ b/components/nvidia-widgets/doc/nvglwidgets/ctranslucent.html @@ -16,7 +16,7 @@

cTranslucent

Declaration

-

Source position: nvglwidgets.pas line 24

+

Source position: nvglwidgets.pas line 26

const cTexViewWidgetFSSource = '#version 120' + LineEnding + 'uniform float mipLevel /*= 0*/;' + LineEnding + 'uniform float texelScale /*= 1.0*/;' + LineEnding + 'uniform float texelOffset /*= 0.0*/;' + LineEnding + 'uniform ivec4 texelSwizzling /*= ivec4( 0, 1, 2, 3)*/;' + LineEnding + 'uniform sampler2D samp;' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' vec4 texel;' + LineEnding + ' if (mipLevel > 0)' + LineEnding + ' texel = texture2DLod( samp, gl_TexCoord[0].xy, mipLevel);' + LineEnding + ' else' + LineEnding + ' texel = texture2D( samp, gl_TexCoord[0].xy);' + LineEnding + ' texel = texel * texelScale + texelOffset;' + LineEnding + ' gl_FragColor = texel.x * vec4( texelSwizzling.x == 0, texelSwizzling.y == 0, texelSwizzling.z == 0, texelSwizzling.w == 0 );' + LineEnding + ' gl_FragColor += texel.y * vec4( texelSwizzling.x == 1, texelSwizzling.y == 1, texelSwizzling.z == 1, texelSwizzling.w == 1 );' + LineEnding + ' gl_FragColor += texel.z * vec4( texelSwizzling.x == 2, texelSwizzling.y == 2, texelSwizzling.z == 2, texelSwizzling.w == 2 );' + LineEnding + ' gl_FragColor += texel.w * vec4( texelSwizzling.x == 3, texelSwizzling.y == 3, texelSwizzling.z == 3, texelSwizzling.w == 3 );' + LineEnding + '}';
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html b/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html index 58f628f5b..c10f7a1b5 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cwidgetfssource.html @@ -16,7 +16,7 @@

cWidgetFSSource

Declaration

-

Source position: nvglwidgets.pas line 76

+

Source position: nvglwidgets.pas line 78

const cTranslucent = 20;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html b/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html index 332142d1e..06a4e849a 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html +++ b/components/nvidia-widgets/doc/nvglwidgets/cwidgetvssource.html @@ -16,7 +16,7 @@

cWidgetVSSource

Declaration

-

Source position: nvglwidgets.pas line 66

+

Source position: nvglwidgets.pas line 68

const cWidgetFSSource = '#version 120' + LineEnding + 'uniform vec4 fillColor /*= vec4( 1.0, 0.0,0.0,1.0)*/;' + LineEnding + 'uniform vec4 borderColor /*= vec4( 1.0, 1.0,1.0,1.0)*/;' + LineEnding + 'uniform vec2 zones;' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' float doTurn = float(gl_TexCoord[0].y > 0);' + LineEnding + ' float radiusOffset = doTurn * abs( gl_TexCoord[0].z );' + LineEnding + ' float turnDir = sign( gl_TexCoord[0].z );' + LineEnding + ' vec2 uv = vec2(gl_TexCoord[0].x + turnDir*radiusOffset, gl_TexCoord[0].y);' + LineEnding + ' float l = abs( length(uv) - radiusOffset );' + LineEnding + ' float a = clamp( l - zones.x, 0.0, 2.0);' + LineEnding + ' float b = clamp( l - zones.y, 0.0, 2.0);' + LineEnding + ' b = exp2(-2.0*b*b);' + LineEnding + ' gl_FragColor = ( fillColor * b + (1.0-b)*borderColor );' + LineEnding + ' gl_FragColor.a *= exp2(-2.0*a*a);' + LineEnding + '}';
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html index c0f308d2b..0072accde 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._begin.html @@ -16,7 +16,7 @@

GLUIPainter._begin

Declaration

-

Source position: nvglwidgets.pas line 129

+

Source position: nvglwidgets.pas line 131

const cWidgetVSSource = '#version 120' + LineEnding + LineEnding + 'void main()' + LineEnding + '{' + LineEnding + ' gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;' + LineEnding + ' gl_TexCoord[0] = gl_MultiTexCoord0;' + LineEnding + '}';
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html index 95cfa008e..0fac622f3 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter._end.html @@ -16,7 +16,7 @@

GLUIPainter._end

Declaration

-

Source position: nvglwidgets.pas line 130

+

Source position: nvglwidgets.pas line 132

public procedure GLUIPainter._begin(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html index a645ebeb1..d47d72e0c 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.create.html @@ -16,7 +16,7 @@

GLUIPainter.Create

Declaration

-

Source position: nvglwidgets.pas line 126

+

Source position: nvglwidgets.pas line 128

public procedure GLUIPainter._end; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.destroy.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.destroy.html index 117c12544..24d869ba6 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.destroy.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.destroy.html @@ -16,10 +16,10 @@

GLUIPainter.Destroy

Declaration

-

Source position: nvglwidgets.pas line 127

+

Source position: nvglwidgets.pas line 129

public constructor GLUIPainter.Create;
- +

public destructor GLUIPainter.Destroy;

public destructor GLUIPainter.Destroy; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html index 064881dc5..02c03bc04 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawboolframe.html @@ -16,7 +16,7 @@

GLUIPainter.drawBoolFrame

Draw bool frame primitive

Declaration

-

Source position: nvglwidgets.pas line 184

+

Source position: nvglwidgets.pas line 186

diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html index 8fb476d3c..1f5863c2b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawbutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawButton

Declaration

-

Source position: nvglwidgets.pas line 139

+

Source position: nvglwidgets.pas line 141

public procedure GLUIPainter.drawBoolFrame(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html index 2726a6eef..8ad52ac6b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcheckbutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawCheckButton

Declaration

-

Source position: nvglwidgets.pas line 142

+

Source position: nvglwidgets.pas line 144

public procedure GLUIPainter.drawButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html index 2dbd3e26e..1f94d7a2d 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcircle.html @@ -16,7 +16,7 @@

GLUIPainter.drawCircle

Draw circle primitive

Declaration

-

Source position: nvglwidgets.pas line 189

+

Source position: nvglwidgets.pas line 191

public procedure GLUIPainter.drawCheckButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html index 52b2b090d..c4670adc9 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombobox.html @@ -16,7 +16,7 @@

GLUIPainter.drawComboBox

Declaration

-

Source position: nvglwidgets.pas line 158

+

Source position: nvglwidgets.pas line 160

public procedure GLUIPainter.drawCircle(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html index 61e148aa1..4a1234b81 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawcombooptions.html @@ -16,7 +16,7 @@

GLUIPainter.drawComboOptions

Declaration

-

Source position: nvglwidgets.pas line 159

+

Source position: nvglwidgets.pas line 161

public procedure GLUIPainter.drawComboBox(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html index ca8011244..dc7d0f1ec 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdebugrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawDebugRect

Draw a rectangle for debugging purposes

Declaration

-

Source position: nvglwidgets.pas line 179

+

Source position: nvglwidgets.pas line 181

public procedure GLUIPainter.drawComboOptions(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html index 32b059555..3e9c55779 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawdownarrow.html @@ -16,7 +16,7 @@

GLUIPainter.drawDownArrow

Draw down arrow primitive

Declaration

-

Source position: nvglwidgets.pas line 192

+

Source position: nvglwidgets.pas line 194

public procedure GLUIPainter.drawDebugRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html index fc938d60d..810cfcc62 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawhorizontalslider.html @@ -16,7 +16,7 @@

GLUIPainter.drawHorizontalSlider

Declaration

-

Source position: nvglwidgets.pas line 148

+

Source position: nvglwidgets.pas line 150

public procedure GLUIPainter.drawDownArrow(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html index 2661b3a6a..d26774bad 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlabel.html @@ -16,7 +16,7 @@

GLUIPainter.drawLabel

Declaration

-

Source position: nvglwidgets.pas line 136

+

Source position: nvglwidgets.pas line 138

public procedure GLUIPainter.drawHorizontalSlider(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html index 72f67cf72..3bb2ae9ae 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlineedit.html @@ -16,7 +16,7 @@

GLUIPainter.drawLineEdit

Declaration

-

Source position: nvglwidgets.pas line 162

+

Source position: nvglwidgets.pas line 164

public procedure GLUIPainter.drawLabel(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html index 6fa41cc87..63d7539ff 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistbox.html @@ -16,7 +16,7 @@

GLUIPainter.drawListBox

Declaration

-

Source position: nvglwidgets.pas line 154

+

Source position: nvglwidgets.pas line 156

public procedure GLUIPainter.drawLineEdit(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html index de6dd97e7..7691d8832 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawlistitem.html @@ -16,7 +16,7 @@

GLUIPainter.drawListItem

Declaration

-

Source position: nvglwidgets.pas line 151

+

Source position: nvglwidgets.pas line 153

public procedure GLUIPainter.drawListBox(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html index 752b2253f..afb0ae8b1 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawminus.html @@ -16,7 +16,7 @@

GLUIPainter.drawMinus

Draw minus primitive

Declaration

-

Source position: nvglwidgets.pas line 190

+

Source position: nvglwidgets.pas line 192

public procedure GLUIPainter.drawListItem(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html index 0b76aeb46..3b52cbdcb 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawpanel.html @@ -16,7 +16,7 @@

GLUIPainter.drawPanel

Declaration

-

Source position: nvglwidgets.pas line 165

+

Source position: nvglwidgets.pas line 167

public procedure GLUIPainter.drawMinus(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html index 46627349d..22cf394dd 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawplus.html @@ -16,7 +16,7 @@

GLUIPainter.drawPlus

Draw plus primitive

Declaration

-

Source position: nvglwidgets.pas line 191

+

Source position: nvglwidgets.pas line 193

public procedure GLUIPainter.drawPanel(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html index d02a6bb42..398241900 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawradiobutton.html @@ -16,7 +16,7 @@

GLUIPainter.drawRadioButton

Declaration

-

Source position: nvglwidgets.pas line 145

+

Source position: nvglwidgets.pas line 147

public procedure GLUIPainter.drawPlus(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html index 9bd35dcb5..3def77462 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawRect

Draw rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 186

+

Source position: nvglwidgets.pas line 188

public procedure GLUIPainter.drawRadioButton(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html index 41d6dbc9a..83ada5e1f 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrect.html @@ -16,7 +16,7 @@

GLUIPainter.drawRoundedRect

Draw rouded rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 187

+

Source position: nvglwidgets.pas line 189

public procedure GLUIPainter.drawRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html index 701827ceb..481c0f6dc 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawroundedrectoutline.html @@ -16,7 +16,7 @@

GLUIPainter.drawRoundedRectOutline

Draw rouded rectangle outline primitive

Declaration

-

Source position: nvglwidgets.pas line 188

+

Source position: nvglwidgets.pas line 190

public procedure GLUIPainter.drawRoundedRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html index a3649bb1a..18c201add 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawstring.html @@ -16,7 +16,7 @@

GLUIPainter.drawString

Draw multi-line text primitive

Declaration

-

Source position: nvglwidgets.pas line 185

+

Source position: nvglwidgets.pas line 187

public procedure GLUIPainter.drawRoundedRectOutline(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html index cbf91db89..baf26a9c7 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtext.html @@ -16,7 +16,7 @@

GLUIPainter.drawText

Draw text with rectangle primitive

Declaration

-

Source position: nvglwidgets.pas line 182

+

Source position: nvglwidgets.pas line 184

public procedure GLUIPainter.drawString(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html index 1cd541793..43e0fec46 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawtextureview.html @@ -16,7 +16,7 @@

GLUIPainter.drawTextureView

Declaration

-

Source position: nvglwidgets.pas line 168

+

Source position: nvglwidgets.pas line 170

public procedure GLUIPainter.drawText(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html index 2f1edd764..634fc132b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.drawuparrow.html @@ -16,7 +16,7 @@

GLUIPainter.drawUpArrow

Draw up arrow primitive

Declaration

-

Source position: nvglwidgets.pas line 193

+

Source position: nvglwidgets.pas line 195

public procedure GLUIPainter.drawTextureView(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html index 9be6eee30..386294f33 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getbuttonrect.html @@ -16,7 +16,7 @@

GLUIPainter.getButtonRect

Declaration

-

Source position: nvglwidgets.pas line 138

+

Source position: nvglwidgets.pas line 140

public procedure GLUIPainter.drawUpArrow(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html index b7250a189..d1b200f80 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasmargin.html @@ -16,7 +16,7 @@

GLUIPainter.getCanvasMargin

Evaluate canvas margin

Declaration

-

Source position: nvglwidgets.pas line 171

+

Source position: nvglwidgets.pas line 173

public function GLUIPainter.getButtonRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html index 3f3de8f10..dc00751a0 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcanvasspace.html @@ -16,7 +16,7 @@

GLUIPainter.getCanvasSpace

Evaluate canvas space

Declaration

-

Source position: nvglwidgets.pas line 172

+

Source position: nvglwidgets.pas line 174

public function GLUIPainter.getCanvasMargin: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html index 26f5dc1c6..0f6c43004 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcheckrect.html @@ -16,7 +16,7 @@

GLUIPainter.getCheckRect

Declaration

-

Source position: nvglwidgets.pas line 141

+

Source position: nvglwidgets.pas line 143

public function GLUIPainter.getCanvasSpace: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html index 9c1bb8bad..a19a08de4 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcombooptionsrect.html @@ -16,7 +16,7 @@

GLUIPainter.getComboOptionsRect

Declaration

-

Source position: nvglwidgets.pas line 157

+

Source position: nvglwidgets.pas line 159

public function GLUIPainter.getCheckRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html index 9f2eb4c54..479bb67fe 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getcomborect.html @@ -16,7 +16,7 @@

GLUIPainter.getComboRect

Declaration

-

Source position: nvglwidgets.pas line 156

+

Source position: nvglwidgets.pas line 158

public function GLUIPainter.getComboOptionsRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html index 676b63125..a565514d2 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getfontheight.html @@ -16,7 +16,7 @@

GLUIPainter.getFontHeight

Evaluate font height

Declaration

-

Source position: nvglwidgets.pas line 173

+

Source position: nvglwidgets.pas line 175

public function GLUIPainter.getComboRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html index 3e8da29c7..931815b2c 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gethorizontalsliderrect.html @@ -16,7 +16,7 @@

GLUIPainter.getHorizontalSliderRect

Declaration

-

Source position: nvglwidgets.pas line 147

+

Source position: nvglwidgets.pas line 149

public function GLUIPainter.getFontHeight: Integer; override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html index 687cfccce..d3c75e4fa 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getitemrect.html @@ -16,7 +16,7 @@

GLUIPainter.getItemRect

Declaration

-

Source position: nvglwidgets.pas line 150

+

Source position: nvglwidgets.pas line 152

public function GLUIPainter.getHorizontalSliderRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html index e3922eaa3..252be9f43 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlabelrect.html @@ -16,7 +16,7 @@

GLUIPainter.getLabelRect

Declaration

-

Source position: nvglwidgets.pas line 135

+

Source position: nvglwidgets.pas line 137

public function GLUIPainter.getItemRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html index 250f208d6..65ffaaa45 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlineeditrect.html @@ -16,7 +16,7 @@

GLUIPainter.getLineEditRect

Declaration

-

Source position: nvglwidgets.pas line 161

+

Source position: nvglwidgets.pas line 163

public function GLUIPainter.getLabelRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html index 2fda85013..d66e59a41 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getlistrect.html @@ -16,7 +16,7 @@

GLUIPainter.getListRect

Declaration

-

Source position: nvglwidgets.pas line 153

+

Source position: nvglwidgets.pas line 155

public function GLUIPainter.getLineEditRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html index 67074dcca..84ef0944b 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpanelrect.html @@ -16,7 +16,7 @@

GLUIPainter.getPanelRect

Declaration

-

Source position: nvglwidgets.pas line 164

+

Source position: nvglwidgets.pas line 166

public function GLUIPainter.getListRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html index 54fde77dc..7c344b803 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getpickedcharnb.html @@ -16,7 +16,7 @@

GLUIPainter.getPickedCharNb

Declaration

-

Source position: nvglwidgets.pas line 177

+

Source position: nvglwidgets.pas line 179

public function GLUIPainter.getPanelRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html index f32e558f2..166828fb8 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.getradiorect.html @@ -16,7 +16,7 @@

GLUIPainter.getRadioRect

Declaration

-

Source position: nvglwidgets.pas line 144

+

Source position: nvglwidgets.pas line 146

public function GLUIPainter.getPickedCharNb(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html index ba1a7cfaf..67895e2ec 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidth.html @@ -16,7 +16,7 @@

GLUIPainter.getTextLineWidth

Evaluate text width

Declaration

-

Source position: nvglwidgets.pas line 174

+

Source position: nvglwidgets.pas line 176

public function GLUIPainter.getRadioRect(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html index 960914b4a..35ee62635 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextlinewidthat.html @@ -16,7 +16,7 @@

GLUIPainter.getTextLineWidthAt

Declaration

-

Source position: nvglwidgets.pas line 176

+

Source position: nvglwidgets.pas line 178

public function GLUIPainter.getTextLineWidth(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html index 206aa6e66..7ab9d04d7 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextsize.html @@ -16,7 +16,7 @@

GLUIPainter.getTextSize

Evaluate text size

Declaration

-

Source position: nvglwidgets.pas line 175

+

Source position: nvglwidgets.pas line 177

public function GLUIPainter.getTextLineWidthAt(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html index 51c42628e..db0add9c9 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.gettextureviewrect.html @@ -16,7 +16,7 @@

GLUIPainter.getTextureViewRect

Declaration

-

Source position: nvglwidgets.pas line 167

+

Source position: nvglwidgets.pas line 169

public function GLUIPainter.getTextSize(
diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html index d996bf188..470e2cd16 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.html @@ -17,7 +17,7 @@

[Properties (by Name)] [Methods (by Name)] [Events (by Name)]

OpenGL painter class

Declaration

-

Source position: nvglwidgets.pas line 123

+

Source position: nvglwidgets.pas line 125

public function GLUIPainter.getTextureViewRect(
@@ -29,7 +29,7 @@ - + diff --git a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html index 854b8abd5..fdf1d8fb2 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html +++ b/components/nvidia-widgets/doc/nvglwidgets/gluipainter.init.html @@ -16,7 +16,7 @@

GLUIPainter.init

Initialization method of the painter class

Declaration

-

Source position: nvglwidgets.pas line 195

+

Source position: nvglwidgets.pas line 197

type GLUIPainter = class(UIPainter)

  constructor Create;

  destructor Destroy;

  destructor Destroy; override;

  procedure _begin(); override;
diff --git a/components/nvidia-widgets/doc/nvglwidgets/s_colors.html b/components/nvidia-widgets/doc/nvglwidgets/s_colors.html index 3a923b05f..bf2d7a2b1 100644 --- a/components/nvidia-widgets/doc/nvglwidgets/s_colors.html +++ b/components/nvidia-widgets/doc/nvglwidgets/s_colors.html @@ -16,7 +16,7 @@

s_colors

Declaration

-

Source position: nvglwidgets.pas line 27

+

Source position: nvglwidgets.pas line 29

public procedure GLUIPainter.init; override;
diff --git a/components/nvidia-widgets/doc/nvshaderutils/compileasmshader.html b/components/nvidia-widgets/doc/nvshaderutils/compileasmshader.html index fee8b73b7..b32574b37 100644 --- a/components/nvidia-widgets/doc/nvshaderutils/compileasmshader.html +++ b/components/nvidia-widgets/doc/nvshaderutils/compileasmshader.html @@ -16,7 +16,7 @@

CompileASMShader

Declaration

-

Source position: nvshaderutils.pas line 20

+

Source position: nvshaderutils.pas line 22

const s_colors: array [0..23,0..3] of GLfloat = ((89 / 255, 89 / 255, 89 / 255, 0.7), (166 / 255, 166 / 255, 166 / 255, 0.8), (212 / 255, 228 / 255, 60 / 255, 0.5), (227 / 255, 237 / 255, 127 / 255, 0.5), (99 / 255, 37 / 255, 35 / 255, 1.0), (149 / 255, 55 / 255, 53 / 255, 1.0), (212 / 255, 228 / 255, 60 / 255, 1.0), (227 / 255, 237 / 255, 127 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (255 / 255, 255 / 255, 255 / 255, 1.0), (79 / 255, 129 / 255, 189 / 255, 1.0), (79 / 255, 129 / 255, 189 / 255, 1.0), (128 / 255, 100 / 255, 162 / 255, 1.0), (128 / 255, 100 / 255, 162 / 255, 1.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0), (0 / 255, 0 / 255, 0 / 255, 0.0));
diff --git a/components/nvidia-widgets/doc/nvshaderutils/compileasmshaderfromfile.html b/components/nvidia-widgets/doc/nvshaderutils/compileasmshaderfromfile.html index 6b07646fd..500849e2f 100644 --- a/components/nvidia-widgets/doc/nvshaderutils/compileasmshaderfromfile.html +++ b/components/nvidia-widgets/doc/nvshaderutils/compileasmshaderfromfile.html @@ -16,7 +16,7 @@

CompileASMShaderFromFile

Declaration

-

Source position: nvshaderutils.pas line 21

+

Source position: nvshaderutils.pas line 23

function CompileASMShader(
diff --git a/components/nvidia-widgets/doc/nvshaderutils/compileglslshader.html b/components/nvidia-widgets/doc/nvshaderutils/compileglslshader.html index 243df3057..32467b15a 100644 --- a/components/nvidia-widgets/doc/nvshaderutils/compileglslshader.html +++ b/components/nvidia-widgets/doc/nvshaderutils/compileglslshader.html @@ -16,7 +16,7 @@

CompileGLSLShader

Declaration

-

Source position: nvshaderutils.pas line 16

+

Source position: nvshaderutils.pas line 18

function CompileASMShaderFromFile(
diff --git a/components/nvidia-widgets/doc/nvshaderutils/compileglslshaderfromfile.html b/components/nvidia-widgets/doc/nvshaderutils/compileglslshaderfromfile.html index 724abefaa..aa482b501 100644 --- a/components/nvidia-widgets/doc/nvshaderutils/compileglslshaderfromfile.html +++ b/components/nvidia-widgets/doc/nvshaderutils/compileglslshaderfromfile.html @@ -16,7 +16,7 @@

CompileGLSLShaderFromFile

Declaration

-

Source position: nvshaderutils.pas line 17

+

Source position: nvshaderutils.pas line 19

function CompileGLSLShader(
diff --git a/components/nvidia-widgets/doc/nvwidgets.chm b/components/nvidia-widgets/doc/nvwidgets.chm index 20e3019ca..09a09c83d 100644 Binary files a/components/nvidia-widgets/doc/nvwidgets.chm and b/components/nvidia-widgets/doc/nvwidgets.chm differ diff --git a/components/nvidia-widgets/src/gl/glfreetype.pas b/components/nvidia-widgets/src/gl/glfreetype.pas index 40bb49ab9..d2793c42b 100644 --- a/components/nvidia-widgets/src/gl/glfreetype.pas +++ b/components/nvidia-widgets/src/gl/glfreetype.pas @@ -15,6 +15,9 @@ uses //This holds all of the information related to any //freetype font that we want to create. type + + { TGLFreeTypeFont } + TGLFreeTypeFont = object Height: cardinal; //< Holds the height of the font. textures: pGLuint; //< Holds the texture id's @@ -31,6 +34,8 @@ type //out text at window coordinates x, y, using the font ft_font. //The current modelview matrix will also be applied to the text. procedure Print(x, y: double; Text: string); + + function TextWidth(const Text: string): integer; end; implementation @@ -38,6 +43,10 @@ implementation const CHAR_NUM = 255; +var + //this is the cached advance of each glyph in pixels + glyphadvance: array[0..CHAR_NUM - 1] of LongInt; + //This function gets the first power of 2 >= the //int that we pass it. function next_p2(a: integer): integer; inline; @@ -156,21 +165,21 @@ begin //so we need to link the texture to the quad //so that the result will be properly aligned. glBegin(GL_QUADS); - glTexCoord2d(0, 0); - glVertex2f(0, bitmap.rows); - glTexCoord2d(0, y); - glVertex2f(0, 0); - glTexCoord2d(x, y); - glVertex2f(bitmap.Width, 0); - glTexCoord2d(x, 0); - glVertex2f(bitmap.Width, bitmap.rows); + glTexCoord2d(0, 0); + glVertex2f(0, bitmap.rows); + glTexCoord2d(0, y); + glVertex2f(0, 0); + glTexCoord2d(x, y); + glVertex2f(bitmap.Width, 0); + glTexCoord2d(x, 0); + glVertex2f(bitmap.Width, bitmap.rows); glEnd; glPopMatrix; glTranslatef(face^.glyph^.advance.x shr 6, 0, 0); //increment the raster position as if we were a bitmap font. - //(only needed if you want to calculate text length) - glBitmap(0, 0, 0, 0, face^.glyph^.advance.x shr 6, 0, nil); + //(needed if you want to calculate text length) + glyphadvance[Ord(ch)] := face^.glyph^.advance.x shr 6; //Finish the display list glEndList; @@ -263,9 +272,9 @@ var font: GLuint; modelview_matrix: array [0..15] of double; begin + //We want a coordinate system where things coresponding to window pixels. pushScreenCoordinateMatrix; - //We want a coordinate system where things coresponding to window pixels. font := list_base; //Results Are Stored In Text @@ -303,5 +312,14 @@ begin pop_projection_matrix; end; +function TGLFreeTypeFont.TextWidth(const Text: string): integer; +var + i: Integer; +begin + Result := 0; + for i := 1 to Length(Text) do + Result += glyphadvance[Ord(Text[i])]; +end; + end. diff --git a/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas b/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas index 3c082c555..e3db7fa7c 100644 --- a/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas +++ b/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas @@ -797,20 +797,12 @@ end; function GLUIPainter.getFontHeight: integer; begin - Result := Font.Height; - exit; - Result := 12 + 4; + Result := Font.Height + 4; end; function GLUIPainter.getTextLineWidth(const Text: string): integer; -var - w: integer = 0; - i: integer; begin - for i := 1 to Length(Text) do - w := w + glutBitmapWidth(GLUT_BITMAP_HELVETICA_12, Ord(Text[i])); - - Result := w + 2; + Result := Font.TextWidth(Text) + 2; end; function GLUIPainter.getTextSize(const Text: string; out nbLines: integer): integer; @@ -842,7 +834,7 @@ begin for i := 0 to charNb - 1 do begin if (Text[i] <> #13) and (Text[i + 1] <> #10) then - w := w + glutBitmapWidth(GLUT_BITMAP_HELVETICA_12, Ord(Text[i])) + w := w + Font.TextWidth(Text[i]) else begin Result := w + 1; @@ -870,7 +862,7 @@ begin i := 0; while (i <= Length(Text)) and (Text[i] <> #13) and (Text[i + 1] <> #10) do begin - w := w + glutBitmapWidth(GLUT_BITMAP_HELVETICA_12, Ord(Text[i])); + w := w + Font.TextWidth(Text[i]); if at.x < w then begin Result := i - textstart; @@ -933,7 +925,7 @@ end; procedure GLUIPainter.drawString(x: integer; y: integer; Text: string; nbLines: integer); begin - Font.Print(x, y, Text); + Font.Print(x, y + 2, Text); end; procedure GLUIPainter.drawRect(aRect: Rect; fillColorId: integer; borderColorId: integer);

function CompileGLSLShaderFromFile(