From bbc22ac8caa6dc832a1571222358636ffde1a383 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 2 Jul 2015 11:26:35 -0600 Subject: [PATCH] Comments + remove trailing comma --- imgui.cpp | 5 +++-- imgui.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 4645d2b3..0d59d8c2 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -386,6 +386,7 @@ - slider: allow using the [-]/[+] buttons used by InputFloat()/InputInt() - 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. + - 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: centered text for slider as input text so it matches typical positioning. - text edit: flag to disable live update of the user buffer. @@ -4756,8 +4757,8 @@ void ImGui::SetWindowFontScale(float scale) g.FontSize = window->CalcFontSize(); } -// NB: 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'. +// 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 confusing because GetCursorPos() == (DC.CursorPos - window.Pos). May want to rename 'DC.CursorPos'. ImVec2 ImGui::GetCursorPos() { ImGuiWindow* window = GetCurrentWindow(); diff --git a/imgui.h b/imgui.h index 4e12ba47..fd1bc922 100644 --- a/imgui.h +++ b/imgui.h @@ -562,7 +562,7 @@ enum ImGuiAlign_ ImGuiAlign_Right = 1 << 2, ImGuiAlign_Top = 1 << 3, ImGuiAlign_VCenter = 1 << 4, - ImGuiAlign_Default = ImGuiAlign_Left | ImGuiAlign_Top, + ImGuiAlign_Default = ImGuiAlign_Left | ImGuiAlign_Top }; // Enumeration for ColorEditMode()