Merge branch '1.78'

Author: elect86

.idea/codeStyles/Project.xml

@@ -38,6 +38,7 @@ import imgui.ImGui.pushID
 import imgui.ImGui.pushTextWrapPos
 import imgui.ImGui.sameLine
 import imgui.ImGui.saveIniSettingsToDisk
+import imgui.ImGui.saveIniSettingsToMemory
 import imgui.ImGui.selectable
 import imgui.ImGui.separator
 import imgui.ImGui.setNextItemWidth
@@ -286,17 +287,19 @@ interface demoDebugInformations {
 //
         // Details for Docking
 //        #ifdef IMGUI_HAS_DOCK
-//                if (ImGui::TreeNode("Docking"))
-//                {
-//                    ImGui::TreePop();
-//                }
+        treeNode("Dock nodes") {
+
+        }
 //        #endif // #define IMGUI_HAS_DOCK
 
         // Settings
         treeNode("Settings") {
             if (smallButton("Clear"))
                 clearIniSettings()
             sameLine()
+            if (smallButton("Save to memory"))
+                saveIniSettingsToMemory()
+            sameLine()
             if (smallButton("Save to disk"))
                 saveIniSettingsToDisk(io.iniFilename)
             sameLine()
@@ -306,7 +309,7 @@ interface demoDebugInformations {
                 textUnformatted("<NULL>")
             text("SettingsDirtyTimer %.2f", g.settingsDirtyTimer)
             treeNode("SettingsHandlers", "Settings handlers: (${g.settingsHandlers.size})") {
-                g.settingsHandlers.forEach { textUnformatted(it.typeName) }
+                g.settingsHandlers.forEach { bulletText(it.typeName) }
             }
             treeNode("SettingsWindows", "Settings packed data: Windows: ${g.settingsWindows.size} bytes") {
                 g.settingsWindows.forEach(Funcs::nodeWindowSettings)
@@ -329,6 +332,7 @@ interface demoDebugInformations {
         if (treeNode("Internal state")) {
             text("HoveredWindow: '${g.hoveredWindow?.name}'")
             text("HoveredRootWindow: '${g.hoveredWindow?.name}'")
+            text("HoveredWindowUnderMovingWindow: '${g.hoveredWindowUnderMovingWindow?.name}'")
             /*  Data is "in-flight" so depending on when the Metrics window is called we may see current frame
                 information or not                 */
             text("HoveredId: 0x%08X/0x%08X (%.2f sec), AllowOverlap: ${g.hoveredIdAllowOverlap}", g.hoveredId, g.hoveredIdPreviousFrame, g.hoveredIdTimer)
@@ -360,7 +364,7 @@ interface demoDebugInformations {
                 if (showWindowsBeginOrder && window.flags hasnt Wf._ChildWindow) {
                     val buf = "${window.beginOrderWithinContext}"
                     drawList.addRectFilled(window.pos, window.pos + Vec2(fontSize), COL32(200, 100, 100, 255))
-                    drawList.addText(window.pos, COL32(255, 255, 255, 255), buf)
+                    drawList.addText(window.pos, COL32(255), buf)
                 }
             }
 

.idea/runConfigurations/Opengl3Kt.xml

@@ -187,7 +187,8 @@ interface dragAndDrop {
 
         val window = g.currentWindow!!
         if (window.dc.lastItemStatusFlags hasnt ItemStatusFlag.HoveredRect) return false
-        g.hoveredWindow.let { if (it == null || window.rootWindow !== it.rootWindow) return false }
+        val hoveredWindow = g.hoveredWindowUnderMovingWindow
+        if (hoveredWindow == null || window.rootWindow !== hoveredWindow.rootWindow) return false
 
         val displayRect = when {
             window.dc.lastItemStatusFlags has ItemStatusFlag.HasDisplayRect -> window.dc.lastItemDisplayRect

core/src/main/kotlin/imgui/api/demoDebugInformations.kt

@@ -12,7 +12,7 @@ import imgui.internal.classes.Rect
 
 
 /** Inputs Utilities: Keyboard
- *  - For 'int user_key_index' you can use your own indices/enums according to how your backend/engine stored them in io.KeysDown[].
+ *  - For 'int user_key_index' you can use your own indices/enums according to how your back-end/engine stored them in io.KeysDown[].
  *  - We don't know the meaning of those value. You can use GetKeyIndex() to map a ImGuiKey_ value into the user index. */
 interface inputUtilitiesKeyboard {
 

core/src/main/kotlin/imgui/api/dragAndDrop.kt

@@ -52,7 +52,7 @@ interface inputUtilitiesMouse {
     }
 
 
-    /** did mouse button double-clicked? A double-click returns false in IsMouseClicked(). uses io.MouseDoubleClickTime.    */
+    /** did mouse button double-clicked? (note that a double-click will also report IsMouseClicked() == true) */
     fun isMouseDoubleClicked(button: MouseButton): Boolean {
         if (button == MouseButton.None)
             return false // The None button is never clicked.

core/src/main/kotlin/imgui/api/inputUtilitiesKeyboard.kt

@@ -49,7 +49,7 @@ interface itemWidgetsUtilities {
                     g.navDisableMouseHover || !window.isContentHoverable(flags) -> false
                     // Test if the item is disabled
                     window.dc.itemFlags has ItemFlag.Disabled && flags hasnt Hf.AllowWhenDisabled -> false
-                    /*  Special handling for the dummy item after Begin() which represent the title bar or tab.
+                    /*  Special handling for calling after Begin() which represent the title bar or tab.
                         When the window is collapsed (SkipItems==true) that last item will never be overwritten
                         so we need to detect the case.  */
                     window.dc.lastItemId == window.moveId && window.writeAccessed -> false

core/src/main/kotlin/imgui/api/inputUtilitiesMouse.kt

@@ -1,6 +1,7 @@
 package imgui.api
 
 import glm_.f
+import glm_.hasnt
 import glm_.max
 import glm_.min
 import glm_.vec2.Vec2
@@ -25,6 +26,7 @@ import imgui.ImGui.updateMouseMovingWindowEndFrame
 import imgui.ImGui.updateMouseMovingWindowNewFrame
 import imgui.classes.IO
 import imgui.classes.Style
+import imgui.font.FontAtlas
 import imgui.internal.*
 import imgui.internal.sections.or
 import imgui.static.*
@@ -80,13 +82,16 @@ interface main {
         g.drawListSharedData.clipRectFullscreen = Vec4(0f, 0f, io.displaySize.x, io.displaySize.y)
         g.drawListSharedData.curveTessellationTol = style.curveTessellationTol
         g.drawListSharedData.setCircleSegmentMaxError_(style.circleSegmentMaxError)
-        g.drawListSharedData.initialFlags = Dlf.None.i
+        var flags = Dlf.None.i
         if (style.antiAliasedLines)
-            g.drawListSharedData.initialFlags = g.drawListSharedData.initialFlags or Dlf.AntiAliasedLines
+            flags = flags or Dlf.AntiAliasedLines
+        if (style.antiAliasedLinesUseTex && g.font.containerAtlas.flags hasnt FontAtlas.Flag.NoBakedLines.i)
+            flags = flags or Dlf.AntiAliasedLinesUseTex
         if (style.antiAliasedFill)
-            g.drawListSharedData.initialFlags = g.drawListSharedData.initialFlags or Dlf.AntiAliasedFill
+            flags = flags or Dlf.AntiAliasedFill
         if (io.backendFlags has BackendFlag.RendererHasVtxOffset)
-            g.drawListSharedData.initialFlags = g.drawListSharedData.initialFlags or Dlf.AllowVtxOffset
+            flags = flags or Dlf.AllowVtxOffset
+        g.drawListSharedData.initialFlags = flags
 
         g.backgroundDrawList._resetForNewFrame()
         g.backgroundDrawList.pushTextureId(io.fonts.texID)
@@ -115,6 +120,7 @@ interface main {
         g.hoveredIdPreviousFrame = g.hoveredId
         g.hoveredId = 0
         g.hoveredIdAllowOverlap = false
+        g.hoveredIdDisabled = false
 
         // Update ActiveId data (clear reference to active widget if the widget isn't alive anymore)
         if (g.activeIdIsAlive != g.activeId && g.activeIdPreviousFrame == g.activeId && g.activeId != 0)

core/src/main/kotlin/imgui/api/itemWidgetsUtilities.kt

@@ -17,6 +17,7 @@ import imgui.ImGui.navMoveRequestTryWrapping
 import imgui.ImGui.openPopupEx
 import imgui.ImGui.setNextWindowPos
 import imgui.ImGui.topMostPopupModal
+import imgui.internal.sections.IMGUI_DEBUG_LOG_POPUP
 import imgui.internal.sections.NavMoveFlag
 import imgui.internal.sections.NextWindowDataFlag
 import imgui.internal.sections.hasnt
@@ -118,7 +119,10 @@ interface popupsModals {
     /** call to mark popup as open (don't call every frame!). */
     fun openPopup(strId: String, popupFlags: PopupFlags = PopupFlag.None.i) = openPopupEx(g.currentWindow!!.getID(strId), popupFlags)
 
-    /** helper to open popup when clicked on last item. return true when just opened. (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors)   */
+    /** helper to open popup when clicked on last item. return true when just opened.
+     *  (note: actually triggers on the mouse _released_ event to be consistent with popup behaviors)
+     *
+     *  Open a popup if mouse button is released over the item */
     fun openPopupContextItem(strId: String = "", popupFlags: PopupFlags = PopupFlag.MouseButtonRight.i): Boolean =
             with(g.currentWindow!!) {
                 val mouseButton = popupFlags and PopupFlag.MouseButtonMask_
@@ -149,7 +153,7 @@ interface popupsModals {
                 break
             popupIdx--
         }
-        //IMGUI_DEBUG_LOG("CloseCurrentPopup %d -> %d\n", g.BeginPopupStack.Size - 1, popup_idx);
+        IMGUI_DEBUG_LOG_POPUP("CloseCurrentPopup ${g.beginPopupStack.lastIndex} -> $popupIdx")
         closePopupToLevel(popupIdx, true)
 
         /*  A common pattern is to close a popup when selecting a menu item/selectable that will open another window.

core/src/main/kotlin/imgui/api/main.kt

@@ -33,7 +33,7 @@ interface tabBarsTabs {
         if (window.skipItems) return
 
         val tabBar = g.currentTabBar ?: error("Mismatched BeginTabBar()/EndTabBar()!")
-        if (tabBar.wantLayout)
+        if (tabBar.wantLayout) // Fallback in case no TabItem have been submitted
             tabBar.layout()
 
         // Restore the last visible height if no tab is visible, this reduce vertical flicker/movement when a tabs gets removed without calling SetTabItemClosed().
@@ -88,17 +88,17 @@ interface tabBarsTabs {
      *  For tab-bar: call after BeginTabBar() and before Tab submissions. Otherwise call with a window name.
      *
      *  [Public] This is call is 100% optional but it allows to remove some one-frame glitches when a tab has been unexpectedly removed.
-     *  To use it to need to call the function SetTabItemClosed() after BeginTabBar() and before any call to BeginTabItem().
-     * Tabs closed by the close button will automatically be flagged to avoid this issue.
-     * FIXME: We should aim to support calling SetTabItemClosed() after the tab submission (for next frame) */
+     *  To use it to need to call the function SetTabItemClosed() between BeginTabBar() and EndTabBar().
+     *  Tabs closed by the close button will automatically be flagged to avoid this issue. */
     fun setTabItemClosed(tabOrDockedWindowLabel: String) {
 
         val isWithinManualTabBar = g.currentTabBar?.flags?.hasnt(TabBarFlag._DockNode) == true
         if (isWithinManualTabBar) {
             val tabBar = g.currentTabBar!!
-            assert(tabBar.wantLayout) { "Needs to be called AFTER BeginTabBar() and BEFORE the first call to BeginTabItem()" }
             val tabId = tabBar calcTabID tabOrDockedWindowLabel
-            tabBar removeTab tabId
+            tabBar.findTabByID(tabId)?.let {
+                it.wantClose = true // Will be processed by next call to TabBarLayout()
+            }
         }
     }