From 9c9f0006da33cfd37bf32d1a87a1dc71af265543 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 5 Jul 2018 15:15:32 -0700 Subject: [PATCH] Documentation fixes --- docs/api/ImportAll.hx | 25 +++++++++++++++++-- .../native/NativeOpenGLRenderContext.hx | 4 +-- src/lime/text/harfbuzz/HBBuffer.hx | 2 +- src/lime/text/harfbuzz/HBBufferFlags.hx | 8 +++--- .../text/harfbuzz/HBBufferSerializeFlags.hx | 8 +++--- src/lime/text/harfbuzz/HBFont.hx | 2 +- src/lime/text/harfbuzz/HBSet.hx | 12 ++------- 7 files changed, 37 insertions(+), 24 deletions(-) diff --git a/docs/api/ImportAll.hx b/docs/api/ImportAll.hx index 2d0bb217f..aa7f899a5 100644 --- a/docs/api/ImportAll.hx +++ b/docs/api/ImportAll.hx @@ -2,7 +2,6 @@ package; import lime.app.Application; -import lime.app.Config; import lime.app.Event; import lime.app.Future; import lime.app.IModule; @@ -58,6 +57,7 @@ import lime.graphics.OpenGLES3RenderContext; import lime.graphics.OpenGLRenderContext; import lime.graphics.PixelFormat; import lime.graphics.RenderContext; +import lime.graphics.RenderContextAttributes; import lime.graphics.RenderContextType; import lime.graphics.WebGL2RenderContext; import lime.graphics.WebGLRenderContext; @@ -127,7 +127,27 @@ import lime.system.Sensor; import lime.system.SensorType; import lime.system.System; import lime.system.ThreadPool; -// TODO: Harfbuzz +import lime.text.harfbuzz.HB; +import lime.text.harfbuzz.HBBlob; +import lime.text.harfbuzz.HBBuffer; +import lime.text.harfbuzz.HBBufferClusterLevel; +import lime.text.harfbuzz.HBBufferContentType; +import lime.text.harfbuzz.HBBufferFlags; +import lime.text.harfbuzz.HBBufferSerializeFlags; +import lime.text.harfbuzz.HBBufferSerializeFormat; +import lime.text.harfbuzz.HBDirection; +import lime.text.harfbuzz.HBFace; +import lime.text.harfbuzz.HBFeature; +import lime.text.harfbuzz.HBFont; +import lime.text.harfbuzz.HBFTFont; +import lime.text.harfbuzz.HBGlyphExtents; +import lime.text.harfbuzz.HBGlyphInfo; +import lime.text.harfbuzz.HBGlyphPosition; +import lime.text.harfbuzz.HBLanguage; +import lime.text.harfbuzz.HBMemoryMode; +import lime.text.harfbuzz.HBScript; +import lime.text.harfbuzz.HBSegmentProperties; +import lime.text.harfbuzz.HBSet; import lime.text.Font; import lime.text.Glyph; import lime.text.GlyphMetrics; @@ -147,6 +167,7 @@ import lime.ui.MouseCursor; import lime.ui.ScanCode; import lime.ui.Touch; import lime.ui.Window; +import lime.ui.WindowAttributes; import lime.utils.ArrayBuffer; import lime.utils.ArrayBufferView; import lime.utils.AssetCache; diff --git a/src/lime/_internal/backend/native/NativeOpenGLRenderContext.hx b/src/lime/_internal/backend/native/NativeOpenGLRenderContext.hx index 5ac783f3f..0c994e929 100644 --- a/src/lime/_internal/backend/native/NativeOpenGLRenderContext.hx +++ b/src/lime/_internal/backend/native/NativeOpenGLRenderContext.hx @@ -2246,7 +2246,7 @@ class NativeOpenGLRenderContext { #if (lime_cffi && lime_opengl && !macro) return NativeCFFI.lime_gl_get_queryi (target, pname); #else - return null; + return 0; #end } @@ -2266,7 +2266,7 @@ class NativeOpenGLRenderContext { #if (lime_cffi && lime_opengl && !macro) return NativeCFFI.lime_gl_get_query_objectui (__getObjectID (query), pname); #else - return null; + return 0; #end } diff --git a/src/lime/text/harfbuzz/HBBuffer.hx b/src/lime/text/harfbuzz/HBBuffer.hx index 8abbf1999..5ba7a605a 100644 --- a/src/lime/text/harfbuzz/HBBuffer.hx +++ b/src/lime/text/harfbuzz/HBBuffer.hx @@ -401,7 +401,7 @@ abstract HBBuffer(CFFIPointer) from CFFIPointer to CFFIPointer { #if (lime_cffi && lime_harfbuzz && !macro) return NativeCFFI.lime_hb_buffer_get_script (this); #else - return null; + return cast 0; #end } diff --git a/src/lime/text/harfbuzz/HBBufferFlags.hx b/src/lime/text/harfbuzz/HBBufferFlags.hx index 356d53939..b7aac0dd8 100644 --- a/src/lime/text/harfbuzz/HBBufferFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferFlags.hx @@ -3,9 +3,9 @@ package lime.text.harfbuzz; @:enum abstract HBBufferFlags(Int) from Int to Int { - public var DEFAULT = 0x00000000u; - public var BOT = 0x00000001u; - public var EOT = 0x00000002u; - public var PRESERVE_DEFAULT_IGNORABLES = 0x00000004u; + public var DEFAULT = 0x00000000; + public var BOT = 0x00000001; + public var EOT = 0x00000002; + public var PRESERVE_DEFAULT_IGNORABLES = 0x00000004; } \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx index a41ceaaef..34a70ea78 100644 --- a/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx +++ b/src/lime/text/harfbuzz/HBBufferSerializeFlags.hx @@ -3,9 +3,9 @@ package lime.text.harfbuzz; @:enum abstract HBBufferSerializeFlags(Int) from Int to Int { - public var DEFAULT = 0x00000000u; - public var NO_CLUSTERS = 0x00000001u; - public var NO_POSITIONS = 0x00000002u; - public var NO_GLYPH_NAMES = 0x00000004u; + public var DEFAULT = 0x00000000; + public var NO_CLUSTERS = 0x00000001; + public var NO_POSITIONS = 0x00000002; + public var NO_GLYPH_NAMES = 0x00000004; } \ No newline at end of file diff --git a/src/lime/text/harfbuzz/HBFont.hx b/src/lime/text/harfbuzz/HBFont.hx index 047e839de..78ea25886 100644 --- a/src/lime/text/harfbuzz/HBFont.hx +++ b/src/lime/text/harfbuzz/HBFont.hx @@ -89,7 +89,7 @@ abstract HBFont(CFFIPointer) from CFFIPointer to CFFIPointer { #if (lime_cffi && lime_harfbuzz && !macro) return NativeCFFI.lime_hb_font_glyph_from_string (this, s); #else - return null; + return 0; #end } diff --git a/src/lime/text/harfbuzz/HBSet.hx b/src/lime/text/harfbuzz/HBSet.hx index aa106f158..5a194c205 100644 --- a/src/lime/text/harfbuzz/HBSet.hx +++ b/src/lime/text/harfbuzz/HBSet.hx @@ -2,6 +2,7 @@ package lime.text.harfbuzz; import lime._internal.backend.native.NativeCFFI; +import lime.math.Vector2; import lime.system.CFFIPointer; @:access(lime._internal.backend.native.NativeCFFI) @@ -10,7 +11,7 @@ import lime.system.CFFIPointer; abstract HBSet(CFFIPointer) from CFFIPointer to CFFIPointer { - public static var empty (get, never):HBBlob; + public static var empty (get, never):HBSet; public var allocationSuccessful (get, never):Bool; public var isEmpty (get, never):Bool; @@ -48,15 +49,6 @@ abstract HBSet(CFFIPointer) from CFFIPointer to CFFIPointer { } - public function addRange (first:Int, last:Int):Void { - - #if (lime_cffi && lime_harfbuzz && !macro) - NativeCFFI.lime_hb_set_add_range (this, first, last); - #end - - } - - public function clear ():Void { #if (lime_cffi && lime_harfbuzz && !macro)