mirror of
https://github.com/ocornut/imgui.git
synced 2025-09-07 11:58:22 +00:00
Tables: fixed TableGetHoveredRow() (#7350, #6588, #6250) + TableGetRowIndex() which never correctly worked when using a clipper.
Amend e09454aec
. Can't understand the comment nor why code was commented. Code looks alright. Compared TableEndRow() between 1.80 and current as well.
This commit is contained in:
@@ -46,6 +46,11 @@ Other Changes:
|
|||||||
- Windows: fixed an issue where resizable child windows would emit border
|
- Windows: fixed an issue where resizable child windows would emit border
|
||||||
logic when hidden/non-visible (e.g. when in a docked window that is not
|
logic when hidden/non-visible (e.g. when in a docked window that is not
|
||||||
selected), impacting code not checking for BeginChild() return value. (#8815)
|
selected), impacting code not checking for BeginChild() return value. (#8815)
|
||||||
|
- Tables: fixed TableGetRowIndex() which never correctly worked when using
|
||||||
|
a clipper (it exists for consistency but is almost never used, as it is
|
||||||
|
often more convenient to use index in caller-code, whereas TableGetRowIndex()
|
||||||
|
includes header rows).
|
||||||
|
- Tables: fixed imgui_internal.h's TableGetHoveredRow() the same way. (#7350, #6588, #6250)
|
||||||
- Error Handling: minor improvements to error handling for TableGetSortSpecs()
|
- Error Handling: minor improvements to error handling for TableGetSortSpecs()
|
||||||
and TableSetBgColor() calls. (#1651, #8499)
|
and TableSetBgColor() calls. (#1651, #8499)
|
||||||
- Misc: fixed building with IMGUI_DISABLE_DEBUG_TOOLS only. (#8796)
|
- Misc: fixed building with IMGUI_DISABLE_DEBUG_TOOLS only. (#8796)
|
||||||
|
@@ -3125,7 +3125,7 @@ static void ImGuiListClipper_SeekCursorAndSetupPrevLine(float pos_y, float line_
|
|||||||
ImGui::TableEndRow(table);
|
ImGui::TableEndRow(table);
|
||||||
table->RowPosY2 = window->DC.CursorPos.y;
|
table->RowPosY2 = window->DC.CursorPos.y;
|
||||||
const int row_increase = (int)((off_y / line_height) + 0.5f);
|
const int row_increase = (int)((off_y / line_height) + 0.5f);
|
||||||
//table->CurrentRow += row_increase; // Can't do without fixing TableEndRow()
|
table->CurrentRow += row_increase;
|
||||||
table->RowBgColorCounter += row_increase;
|
table->RowBgColorCounter += row_increase;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
2
imgui.h
2
imgui.h
@@ -916,7 +916,7 @@ namespace ImGui
|
|||||||
IMGUI_API ImGuiTableSortSpecs* TableGetSortSpecs(); // get latest sort specs for the table (NULL if not sorting). Lifetime: don't hold on this pointer over multiple frames or past any subsequent call to BeginTable().
|
IMGUI_API ImGuiTableSortSpecs* TableGetSortSpecs(); // get latest sort specs for the table (NULL if not sorting). Lifetime: don't hold on this pointer over multiple frames or past any subsequent call to BeginTable().
|
||||||
IMGUI_API int TableGetColumnCount(); // return number of columns (value passed to BeginTable)
|
IMGUI_API int TableGetColumnCount(); // return number of columns (value passed to BeginTable)
|
||||||
IMGUI_API int TableGetColumnIndex(); // return current column index.
|
IMGUI_API int TableGetColumnIndex(); // return current column index.
|
||||||
IMGUI_API int TableGetRowIndex(); // return current row index.
|
IMGUI_API int TableGetRowIndex(); // return current row index (header rows are accounted for)
|
||||||
IMGUI_API const char* TableGetColumnName(int column_n = -1); // return "" if column didn't have a name declared by TableSetupColumn(). Pass -1 to use current column.
|
IMGUI_API const char* TableGetColumnName(int column_n = -1); // return "" if column didn't have a name declared by TableSetupColumn(). Pass -1 to use current column.
|
||||||
IMGUI_API ImGuiTableColumnFlags TableGetColumnFlags(int column_n = -1); // return column flags so you can query their Enabled/Visible/Sorted/Hovered status flags. Pass -1 to use current column.
|
IMGUI_API ImGuiTableColumnFlags TableGetColumnFlags(int column_n = -1); // return column flags so you can query their Enabled/Visible/Sorted/Hovered status flags. Pass -1 to use current column.
|
||||||
IMGUI_API void TableSetColumnEnabled(int column_n, bool v);// change user accessible enabled/disabled state of a column. Set to false to hide the column. User can use the context menu to change this themselves (right-click in headers, or right-click in columns body with ImGuiTableFlags_ContextMenuInBody)
|
IMGUI_API void TableSetColumnEnabled(int column_n, bool v);// change user accessible enabled/disabled state of a column. Set to false to hide the column. User can use the context menu to change this themselves (right-click in headers, or right-click in columns body with ImGuiTableFlags_ContextMenuInBody)
|
||||||
|
Reference in New Issue
Block a user