MultiSelect: Box-Select +Tables: revert 4d00bf8ad which seems unneeded since enforce table layout in BeginMultiSelect(). (#7970, #7821).
This commit is contained in:
+3
-4
@@ -7914,7 +7914,6 @@ static void DebugLogMultiSelectRequests(const char* function, const ImGuiMultiSe
|
|||||||
|
|
||||||
static ImRect CalcScopeRect(ImGuiMultiSelectTempData* ms, ImGuiWindow* window)
|
static ImRect CalcScopeRect(ImGuiMultiSelectTempData* ms, ImGuiWindow* window)
|
||||||
{
|
{
|
||||||
ImGuiContext& g = *GImGui;
|
|
||||||
if (ms->Flags & ImGuiMultiSelectFlags_ScopeRect)
|
if (ms->Flags & ImGuiMultiSelectFlags_ScopeRect)
|
||||||
{
|
{
|
||||||
// Warning: this depends on CursorMaxPos so it means to be called by EndMultiSelect() only
|
// Warning: this depends on CursorMaxPos so it means to be called by EndMultiSelect() only
|
||||||
@@ -7923,10 +7922,10 @@ static ImRect CalcScopeRect(ImGuiMultiSelectTempData* ms, ImGuiWindow* window)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// When a table, pull HostClipRect, which allows us to predict ClipRect before first row/layout is performed. (#7970)
|
//// When a table, pull HostClipRect, which allows us to predict ClipRect before first row/layout is performed. (#7970)
|
||||||
ImRect scope_rect = window->InnerClipRect;
|
ImRect scope_rect = window->InnerClipRect;
|
||||||
if (g.CurrentTable != NULL)
|
//if (g.CurrentTable != NULL)
|
||||||
scope_rect = g.CurrentTable->HostClipRect;
|
// scope_rect = g.CurrentTable->HostClipRect;
|
||||||
|
|
||||||
// Add inner table decoration (#7821) // FIXME: Why not baking in InnerClipRect?
|
// Add inner table decoration (#7821) // FIXME: Why not baking in InnerClipRect?
|
||||||
scope_rect.Min = ImMin(scope_rect.Min + ImVec2(window->DecoInnerSizeX1, window->DecoInnerSizeY1), scope_rect.Max);
|
scope_rect.Min = ImMin(scope_rect.Min + ImVec2(window->DecoInnerSizeX1, window->DecoInnerSizeY1), scope_rect.Max);
|
||||||
|
|||||||
Reference in New Issue
Block a user