Comments about GlyphExtraSpacing

ocornut/imgui@41f9442

Author: elect86

src/main/kotlin/imgui/enums.kt

@@ -74,7 +74,7 @@ infix fun Int.hasnt(b: WindowFlags) = (this and b.i) == 0
 enum class InputTextFlags(val i: Int) {
 
     // Default: 0
-
+    Null(0),
     /** Allow 0123456789 . + - * /      */
     CharsDecimal(1 shl 0),
     /** Allow 0123456789ABCDEFabcdef    */

src/main/kotlin/imgui/font.kt

@@ -38,7 +38,7 @@ class FontConfig {
     /** Align every glyph to pixel boundary. Useful e.g. if you are merging a non-pixel aligned font with the default
      *  font. If enabled, you can set OversampleH/V to 1.   */
     var pixelSnapH = false
-    /** Extra spacing (in pixels) between glyphs    */
+    /** Extra spacing (in pixels) between glyphs. Only X axis is supported for now.    */
     var glyphExtraSpacing = Vec2()
     /** Offset all glyphs from this font input  */
     var glyphOffset = Vec2()

src/main/kotlin/imgui/helpers.kt

@@ -88,7 +88,7 @@ class Storage {
 
     fun clear() = data.clear()
 
-    fun intaa(key: Int, defaultVal: Int = 0) = data[key] ?: defaultVal // TODO rename back
+    fun intaaa(key: Int, defaultVal: Int = 0) = data[key] ?: defaultVal // TODO rename back
 
     operator fun set(key: Int, value: Int) {
         data[key] = value

src/main/kotlin/imgui/imgui/demoDebugInfo.kt

@@ -105,6 +105,7 @@ import imgui.internal.Window
 import java.util.*
 import imgui.Context as g
 import glm_.vec2.operators.div
+import imgui.ImGui.inputTextMultiline
 import imgui.ImGui.isMouseDoubleClicked
 import imgui.ImGui.newLine
 
@@ -383,9 +384,9 @@ interface imgui_demoDebugInfo {
                 }
                 offset += 4
                 treeNode("Rendering more text into the same block") {
-                    selectable("main.c", selected, offset+0); sameLine(300f); text(" 2,345 bytes")
-                    selectable("Hello.cpp", selected, offset+1); sameLine(300f); text("12,345 bytes")
-                    selectable("Hello.h", selected, offset+2); sameLine(300f); text(" 2,345 bytes")
+                    selectable("main.c", selected, offset + 0); sameLine(300f); text(" 2,345 bytes")
+                    selectable("Hello.cpp", selected, offset + 1); sameLine(300f); text("12,345 bytes")
+                    selectable("Hello.h", selected, offset + 2); sameLine(300f); text(" 2,345 bytes")
                 }
                 offset += 3
                 treeNode("In columns") {
@@ -416,7 +417,7 @@ interface imgui_demoDebugInfo {
             }
 
             treeNode("Filtered Text Input TODO") {
-//                static char buf1[64] = ""; ImGui::InputText("default", buf1, 64);
+                //                static char buf1[64] = ""; ImGui::InputText("default", buf1, 64);
 //                static char buf2[64] = ""; ImGui::InputText("decimal", buf2, 64, ImGuiInputTextFlags_CharsDecimal);
 //                static char buf3[64] = ""; ImGui::InputText("hexadecimal", buf3, 64, ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase);
 //                static char buf4[64] = ""; ImGui::InputText("uppercase", buf4, 64, ImGuiInputTextFlags_CharsUppercase);
@@ -430,28 +431,14 @@ interface imgui_demoDebugInfo {
 //                ImGui::SameLine(); ShowHelpMarker("Display all characters as '*'.\nDisable clipboard cut and copy.\nDisable logging.\n");
 //                ImGui::InputText("password (clear)", bufpass, 64, ImGuiInputTextFlags_CharsNoBlank);
             }
-//
-//            if (ImGui::TreeNode("Multi-line Text Input"))
-//            {
-//                static bool read_only = false;
-//                static char text[1024*16] =
-//                        "/*\n"
-//                " The Pentium F00F bug, shorthand for F0 0F C7 C8,\n"
-//                " the hexadecimal encoding of one offending instruction,\n"
-//                " more formally, the invalid operand with locked CMPXCHG8B\n"
-//                " instruction bug, is a design flaw in the majority of\n"
-//                " Intel Pentium, Pentium MMX, and Pentium OverDrive\n"
-//                " processors (all in the P5 microarchitecture).\n"
-//                "*/\n\n"
-//                "label:\n"
-//                "\tlock cmpxchg8b eax\n";
-//
-//                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0,0));
-//                ImGui::Checkbox("Read-only", &read_only);
-//                ImGui::PopStyleVar();
-//                ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(-1.0f, ImGui::GetTextLineHeight() * 16), ImGuiInputTextFlags_AllowTabInput | (read_only ? ImGuiInputTextFlags_ReadOnly : 0));
-//                ImGui::TreePop();
-//            }
+
+            treeNode("Multi-line Text Input TODO") {
+                withStyleVar(StyleVar.FramePadding, Vec2()) {
+                    checkbox("Read-only", readOnly)
+                }
+                val flags = InputTextFlags.AllowTabInput or if(readOnly[0]) InputTextFlags.ReadOnly else InputTextFlags.Null
+//                inputTextMultiline("##source", textMultiline, Vec2(-1f, textLineHeight * 16), flags)
+            }
 //
 //            static bool a=false;
 //            if (ImGui::Button("Button")) { printf("Clicked\n"); a ^= 1; }
@@ -2168,7 +2155,21 @@ interface imgui_demoDebugInfo {
 
         val selected = BooleanArray(4 + 3 + 16 + 16, { it == 1 || it == 23 + 0 || it == 23 + 5 || it == 23 + 10 || it == 23 + 15 })
 
-//        { true, false, false, false, false, true, false, false, false, false, true, false, false, false, false, true };
+        val readOnly = booleanArrayOf(false)
+
+        val textMultiline = CharArray(1024 * 16).also {
+            ("""/*
+                The Pentium F00F bug, shorthand for F0 0F C7 C8,
+                the hexadecimal encoding of one offending instruction,
+                     more formally, the invalid operand with locked CMPXCHG8B
+                     instruction bug, is a design flaw in the majority of
+                     Intel Pentium, Pentium MMX, and Pentium OverDrive
+                     processors (all in the P5 microarchitecture).
+                    */
+
+                    label""".trimMargin() +
+                    "\tlock cmpxchg8b eax\n").toCharArray(it)
+        }
     }
 
     /** Demonstrating creating a simple console window, with scrolling, filtering, completion and history.

src/main/kotlin/imgui/imgui/internal.kt

@@ -1620,7 +1620,7 @@ interface imgui_internal {
             } else {
                 /*  We treat ImGuiSetCondition_Once and ImGuiSetCondition_FirstUseEver the same because tree node state
                     are not saved persistently.                 */
-                val storedValue = storage.intaa(id, -1)
+                val storedValue = storage.intaaa(id, -1)
                 if (storedValue == -1) {
                     isOpen = g.setNextTreeNodeOpenVal
                     storage[id] = isOpen
@@ -1629,7 +1629,7 @@ interface imgui_internal {
             }
             g.setNextTreeNodeOpenCond = 0
         } else
-            isOpen = storage.intaa(id, if (flags has TreeNodeFlags.DefaultOpen) 1 else 0) != 0 // TODO rename back
+            isOpen = storage.intaaa(id, if (flags has TreeNodeFlags.DefaultOpen) 1 else 0) != 0 // TODO rename back
 
         /*  When logging is enabled, we automatically expand tree nodes (but *NOT* collapsing headers.. seems like
             sensible behavior).

src/main/kotlin/imgui/imgui/widgetsInputKeyboard.kt

@@ -7,6 +7,7 @@ import imgui.ImGui.inputTextEx
 import imgui.InputTextFlags
 import imgui.hasnt
 import imgui.internal.DataType
+import imgui.or
 import imgui.Context as g
 
 /** Widgets: Input with Keyboard    */
@@ -19,7 +20,10 @@ interface imgui_widgetsInputKeyboard {
         assert(flags hasnt InputTextFlags.Multiline)    // call InputTextMultiline()
         return inputTextEx(label, buf, Vec2(), flags/*, callback, user_data*/)
     }
-//    IMGUI_API bool          InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size = ImVec2(0,0), ImGuiInputTextFlags flags = 0, ImGuiTextEditCallback callback = NULL, void* user_data = NULL);
+
+    fun inputTextMultiline(label: String, buf: CharArray, size: Vec2 = Vec2(), flags: Int = 0
+            /*,ImGuiTextEditCallback callback = NULL, void* user_data = NULL*/) =
+            inputTextEx(label, buf, size, flags or InputTextFlags.Multiline/*, callback, user_data*/)
 
     fun inputFloat(label: String, v: FloatArray, step: Float = 0f, stepFast: Float = 0f, decimalPrecision: Int = -1, extraFlags: Int = 0) =
             inputFloat(label, v, 0, step, stepFast, decimalPrecision, extraFlags)

src/main/kotlin/imgui/impl/JoglGL3.kt

@@ -104,9 +104,9 @@ object JoglGL3 {
         IO.deltaTime = if (time > 0) (currentTime - time).f else 1f / 60f
         time = currentTime
 
-        // Setup inputs
-        // (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
-        // Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)
+        /*  Setup inputs
+            (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
+            Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)   */
         if (window.hasFocus())
             IO.mousePos put cursorPos
         else

src/main/kotlin/imgui/impl/JoglVrGL3.kt

@@ -23,6 +23,7 @@ import uno.glsl.Program
 object JoglVrGL3 {
 
     lateinit var window: GLWindow
+    val texSize = Vec2i()
     var time = 0.0
     val mousePressed = BooleanArray(3)
     var mouseWheel = 0f
@@ -40,9 +41,10 @@ object JoglVrGL3 {
 
     val mat = Mat4()
 
-    fun init(window: GLWindow, installCallbacks: Boolean): Boolean {
+    fun init(window: GLWindow, texSize: Vec2i, installCallbacks: Boolean): Boolean {
 
         this.window = window
+        this.texSize put texSize
 
         with(IO) {
             // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array.
@@ -72,8 +74,8 @@ object JoglVrGL3 {
         }
 
         if (installCallbacks) {
-            window.addMouseListener(mouseCallback)
-            window.addKeyListener(keyCallback)
+//            window.addMouseListener(mouseCallback)
+//            window.addKeyListener(keyCallback)
         }
 
         return true
@@ -95,8 +97,7 @@ object JoglVrGL3 {
             createDeviceObjects(gl)
 
         // Setup display size (every frame to accommodate for window resizing)
-        IO.displaySize.x = window.width
-        IO.displaySize.y = window.height
+        IO.displaySize put texSize
         IO.displayFramebufferScale.x = 1f //if (window.width > 0) window.framebufferSize.x / window.size.x.f else 0f
         IO.displayFramebufferScale.y = 1f //if (window.height > 0) window.framebufferSize.y / window.size.y.f else 0f
 
@@ -105,13 +106,13 @@ object JoglVrGL3 {
         IO.deltaTime = if (time > 0) (currentTime - time).f else 1f / 60f
         time = currentTime
 
-        // Setup inputs
-        // (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
-        // Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)
-        if (window.hasFocus())
-            IO.mousePos put cursorPos
-        else
-            IO.mousePos put -1
+        /*  Setup inputs
+            (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
+            Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)   */
+//        if (window.hasFocus())
+//            IO.mousePos put cursorPos
+//        else
+//            IO.mousePos put -1
 
         repeat(3) {
             /*  If a mouse press event came, always pass it as "mouse held this frame", so we don't miss click-release
@@ -123,7 +124,7 @@ object JoglVrGL3 {
         mouseWheel = 0f
 
         // Hide OS mouse cursor if ImGui is drawing it
-        window.isPointerVisible = !IO.mouseDrawCursor
+//        window.isPointerVisible = !IO.mouseDrawCursor
 
         // Start the frame
         ImGui.newFrame()

src/main/kotlin/imgui/impl/LwjglGL3.kt

@@ -103,9 +103,9 @@ object LwjglGL3 {
         IO.deltaTime = if (time > 0) (currentTime - time).f else 1f / 60f
         time = currentTime
 
-        // Setup inputs
-        // (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
-        // Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)
+        /*  Setup inputs
+            (we already got mouse wheel, keyboard keys & characters from glfw callbacks polled in glfwPollEvents())
+            Mouse position in screen coordinates (set to -1,-1 if no mouse / on another screen, etc.)   */
         if (window.focused)
             IO.mousePos put window.cursorPos
         else