1
0
mirror of https://github.com/ocornut/imgui.git synced 2025-01-29 19:17:24 +01:00

Comments + remove trailing comma

This commit is contained in:
ocornut 2015-07-02 11:26:35 -06:00
parent e0da1e0658
commit bbc22ac8ca
2 changed files with 4 additions and 3 deletions

View File

@ -386,6 +386,7 @@
- slider: allow using the [-]/[+] buttons used by InputFloat()/InputInt() - slider: allow using the [-]/[+] buttons used by InputFloat()/InputInt()
- slider: initial absolute click is imprecise. change to relative movement slider (same as scrollbar). - slider: initial absolute click is imprecise. change to relative movement slider (same as scrollbar).
- slider: add dragging-based widgets to edit values with mouse (on 2 axises), saving screen real-estate. - slider: add dragging-based widgets to edit values with mouse (on 2 axises), saving screen real-estate.
- dragfloat: up/down axis
- text edit: clean up the mess caused by converting UTF-8 <> wchar. the code is rather inefficient right now. - text edit: clean up the mess caused by converting UTF-8 <> wchar. the code is rather inefficient right now.
- text edit: centered text for slider as input text so it matches typical positioning. - text edit: centered text for slider as input text so it matches typical positioning.
- text edit: flag to disable live update of the user buffer. - text edit: flag to disable live update of the user buffer.
@ -4756,8 +4757,8 @@ void ImGui::SetWindowFontScale(float scale)
g.FontSize = window->CalcFontSize(); g.FontSize = window->CalcFontSize();
} }
// NB: internally we store CursorPos in absolute screen coordinates because it is more convenient. // User generally sees positions in window coordinates. Internally we store CursorPos in absolute screen coordinates because it is more convenient.
// Conversion happens as we pass the value to user, but it makes our naming convention dodgy. May want to rename 'DC.CursorPos'. // Conversion happens as we pass the value to user, but it makes our naming convention confusing because GetCursorPos() == (DC.CursorPos - window.Pos). May want to rename 'DC.CursorPos'.
ImVec2 ImGui::GetCursorPos() ImVec2 ImGui::GetCursorPos()
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();

View File

@ -562,7 +562,7 @@ enum ImGuiAlign_
ImGuiAlign_Right = 1 << 2, ImGuiAlign_Right = 1 << 2,
ImGuiAlign_Top = 1 << 3, ImGuiAlign_Top = 1 << 3,
ImGuiAlign_VCenter = 1 << 4, ImGuiAlign_VCenter = 1 << 4,
ImGuiAlign_Default = ImGuiAlign_Left | ImGuiAlign_Top, ImGuiAlign_Default = ImGuiAlign_Left | ImGuiAlign_Top
}; };
// Enumeration for ColorEditMode() // Enumeration for ColorEditMode()