Skip to content

Commit 553a1c6

Browse files
committed
Internals: renaming IndexWithinParent to OrderWithinParent
ocornut/imgui@85d9c8f
1 parent 17769e4 commit 553a1c6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/kotlin/imgui/imgui/window.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ interface imgui_window {
164164
if (firstBeginOfTheFrame) {
165165

166166
window.active = true
167-
window.indexWithinParent = 0
167+
window.orderWithinParent = 0
168168
window.beginCount = 0
169169
window.clipRect.put(-Float.MAX_VALUE, -Float.MAX_VALUE, +Float.MAX_VALUE, +Float.MAX_VALUE)
170170
window.lastFrameActive = currentFrame
@@ -284,7 +284,7 @@ interface imgui_window {
284284

285285
// Position child window
286286
if (flags has WindowFlags.ChildWindow) {
287-
window.indexWithinParent = parentWindow!!.dc.childWindows.size
287+
window.orderWithinParent = parentWindow!!.dc.childWindows.size
288288
parentWindow.dc.childWindows.add(window)
289289
}
290290
if (flags has WindowFlags.ChildWindow && flags hasnt WindowFlags.Popup) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ class Window(
362362
/** See enum ImGuiWindowFlags_ */
363363
var flags = 0
364364
/** Order within immediate parent window, if we are a child window. Otherwise 0. */
365-
var indexWithinParent = 0
365+
var orderWithinParent = 0
366366

367367
var posF = Vec2()
368368
/** Position rounded-up to nearest pixel */
@@ -619,5 +619,5 @@ class Window(
619619

620620
// FIXME: Add a more explicit sort order in the window structure.
621621
private val childWindowComparer = compareBy<Window>({ it.flags has WindowFlags.Popup }, { it.flags has WindowFlags.Tooltip },
622-
{ it.flags has WindowFlags.ComboBox }, { it.indexWithinParent })
622+
{ it.flags has WindowFlags.ComboBox }, { it.orderWithinParent })
623623
}

0 commit comments

Comments
 (0)