Skip to content

Commit 5409397

Browse files
committed
working on #88
1 parent bde4afc commit 5409397

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

imgui-core/src/main/kotlin/imgui/imgui/widgets/imgui_widgets_inputWithKeyboard.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import imgui.internal.ButtonFlag as Bf
4545
interface imgui_widgets_inputWithKeyboard {
4646

4747

48-
fun inputText(label: String, buf: CharArray, flags: InputTextFlags = 0
49-
, callback: InputTextCallback? = null, userData: Any? = null): Boolean {
48+
fun inputText(label: String, buf: CharArray, flags: InputTextFlags = 0,
49+
callback: InputTextCallback? = null, userData: Any? = null): Boolean {
5050

5151
// TODO, enable callback and userData, related: https://github.com/kotlin-graphics/imgui/commit/082d94e359b2c262cd67c429bfff7fe3900d74cc
5252
assert(flags hasnt Itf.Multiline) { "call InputTextMultiline()" }

imgui-core/src/main/kotlin/imgui/internal/helpers.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,6 @@ fun linearSweep(current: Float, target: Float, speed: Float) = when {
408408

409409

410410
// JVM IMGUI
411-
infix fun CharArray.strncpy(src: CharArray) = strncpy(src, size)
412-
413411
fun CharArray.strncpy(src: CharArray, count: Int) {
414412
if (count < 1) return
415413
for (i in 0 until count) {

imgui-gl/src/test/kotlin/imgui/opengl2_mac.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package imgui
66
import glm_.vec4.Vec4
77
import gln.checkError
88
import gln.glClearColor
9+
import gln.glViewport
910
import imgui.imgui.Context
1011
import imgui.impl.ImplGL2_mac
1112
import imgui.impl.ImplGlfw
@@ -129,8 +130,8 @@ private class ImGuiOpenGL2_Mac {
129130
implGlfw.newFrame()
130131

131132
// Rendering
132-
// ImGui.render()
133-
// glViewport(window.framebufferSize)
133+
ImGui.render()
134+
glViewport(window.framebufferSize)
134135
glClearColor(clearColor)
135136
glClear(GL_COLOR_BUFFER_BIT)
136137

0 commit comments

Comments
 (0)