Skip to content

Commit 710920e

Browse files
committed
tabbing is actually working
1 parent 7258950 commit 710920e

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/main/kotlin/imgui/TextEditState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class TextEditState {
7676
fun getChar(idx: Int) = text[idx]
7777
fun getWidth(lineStartIdx: Int, charIdx: Int): Float {
7878
val c = text[lineStartIdx + charIdx]
79-
return if (c == '\n') -1f else Context.font.getCharAdvance_aaaa(c) * (Context.fontSize / Context.font.fontSize)
79+
return if (c == '\n') -1f else Context.font.getCharAdvance_aaaaa(c) * (Context.fontSize / Context.font.fontSize)
8080
}
8181

8282
fun keyToText(key: Int) = if (key >= 0x10000) 0 else key

src/main/kotlin/imgui/font.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ class Font {
10041004

10051005
// IMGUI_API void SetFallbackChar(ImWchar c);
10061006

1007-
fun getCharAdvance_aaaa(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
1007+
fun getCharAdvance_aaaaa(c: Char) = if (c < indexAdvanceX.size) indexAdvanceX[c.i] else fallbackAdvanceX
10081008

10091009
val isLoaded get() = ::containerAtlas.isInitialized
10101010

src/main/kotlin/imgui/imgui/demo/inputAndFocus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ object inputAndFocus {
114114
if (isItemActive) captureKeyboardFromApp(false)
115115
}
116116

117-
treeNode("Tabbing TODO") {
117+
treeNode("Tabbing") {
118118
text("Use TAB/SHIFT+TAB to cycle through keyboard editable fields.")
119119
inputText("1", buf0)
120120
inputText("2", buf0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ interface imgui_internal {
19011901
inputTextCalcTextSizeW(text, p, textSelectedEnd, it, stopOnNewLine = true).also { p = it() }
19021902
}
19031903
// So we can see selected empty lines
1904-
if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_aaaa(' ') * 0.5f).i.f
1904+
if (rectSize.x <= 0f) rectSize.x = (g.font.getCharAdvance_aaaaa(' ') * 0.5f).i.f
19051905
val rect = Rect(rectPos + Vec2(0f, bgOffYUp - g.fontSize), rectPos + Vec2(rectSize.x, bgOffYDn))
19061906
val clipRect_ = Rect(clipRect)
19071907
rect.clipWith(clipRect_)

src/main/kotlin/imgui/staticFuncs.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ fun inputTextCalcTextSizeW(text: CharArray, textBegin: Int, textEnd: Int, remain
446446
}
447447
if (c == '\r') continue
448448

449-
val charWidth: Float = font.getCharAdvance_aaaa(c) * scale //TODO rename back
449+
val charWidth: Float = font.getCharAdvance_aaaaa(c) * scale //TODO rename back
450450
lineWidth += charWidth
451451
}
452452

0 commit comments

Comments
 (0)