Browse Source

BeginGroup(): fix/amend 9ece0bd.

ocornut 1 year ago
parent
commit
f1519efb16
2 changed files with 3 additions and 0 deletions
  1. 2 0
      imgui.cpp
  2. 1 0
      imgui_internal.h

+ 2 - 0
imgui.cpp

@@ -9847,6 +9847,7 @@ void ImGui::BeginGroup()
     ImGuiGroupData& group_data = g.GroupStack.back();
     ImGuiGroupData& group_data = g.GroupStack.back();
     group_data.WindowID = window->ID;
     group_data.WindowID = window->ID;
     group_data.BackupCursorPos = window->DC.CursorPos;
     group_data.BackupCursorPos = window->DC.CursorPos;
+    group_data.BackupCursorPosPrevLine = window->DC.CursorPosPrevLine;
     group_data.BackupCursorMaxPos = window->DC.CursorMaxPos;
     group_data.BackupCursorMaxPos = window->DC.CursorMaxPos;
     group_data.BackupIndent = window->DC.Indent;
     group_data.BackupIndent = window->DC.Indent;
     group_data.BackupGroupOffset = window->DC.GroupOffset;
     group_data.BackupGroupOffset = window->DC.GroupOffset;
@@ -9881,6 +9882,7 @@ void ImGui::EndGroup()
     ImRect group_bb(group_data.BackupCursorPos, ImMax(window->DC.CursorMaxPos, group_data.BackupCursorPos));
     ImRect group_bb(group_data.BackupCursorPos, ImMax(window->DC.CursorMaxPos, group_data.BackupCursorPos));
 
 
     window->DC.CursorPos = group_data.BackupCursorPos;
     window->DC.CursorPos = group_data.BackupCursorPos;
+    window->DC.CursorPosPrevLine = group_data.BackupCursorPosPrevLine;
     window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos);
     window->DC.CursorMaxPos = ImMax(group_data.BackupCursorMaxPos, window->DC.CursorMaxPos);
     window->DC.Indent = group_data.BackupIndent;
     window->DC.Indent = group_data.BackupIndent;
     window->DC.GroupOffset = group_data.BackupGroupOffset;
     window->DC.GroupOffset = group_data.BackupGroupOffset;

+ 1 - 0
imgui_internal.h

@@ -1064,6 +1064,7 @@ struct IMGUI_API ImGuiGroupData
     ImGuiID     WindowID;
     ImGuiID     WindowID;
     ImVec2      BackupCursorPos;
     ImVec2      BackupCursorPos;
     ImVec2      BackupCursorMaxPos;
     ImVec2      BackupCursorMaxPos;
+    ImVec2      BackupCursorPosPrevLine;
     ImVec1      BackupIndent;
     ImVec1      BackupIndent;
     ImVec1      BackupGroupOffset;
     ImVec1      BackupGroupOffset;
     ImVec2      BackupCurrLineSize;
     ImVec2      BackupCurrLineSize;