diff --git a/.editorconfig b/.editorconfig index 3dd05d3d..284ba13f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,6 @@ -# editorconfig.org +# See http://editorconfig.org to read about the EditorConfig format. +# - Automatically supported by VS2017+ and most common IDE or text editors. +# - For older VS2010 to VS2015, install https://marketplace.visualstudio.com/items?itemName=EditorConfigTeam.EditorConfig # top-most EditorConfig file root = true diff --git a/imgui.cpp b/imgui.cpp index 9876cf92..42a7228e 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -4152,7 +4152,7 @@ void ImGui::EndFrame() { ImGuiContext& g = *GImGui; IM_ASSERT(g.Initialized); - + // Don't process EndFrame() multiple times. if (g.FrameCountEnded == g.FrameCount) return; diff --git a/imgui.h b/imgui.h index 53b2ccab..2d902022 100644 --- a/imgui.h +++ b/imgui.h @@ -1141,7 +1141,7 @@ enum ImGuiCol_ }; // Enumeration for PushStyleVar() / PopStyleVar() to temporarily modify the ImGuiStyle structure. -// - The enum only refers to fields of ImGuiStyle which makes sense to be pushed/popped inside UI code. +// - The enum only refers to fields of ImGuiStyle which makes sense to be pushed/popped inside UI code. // During initialization or between frames, feel free to just poke into ImGuiStyle directly. // - Tip: Use your programming IDE navigation facilities on the names in the _second column_ below to find the actual members and their description. // In Visual Studio IDE: CTRL+comma ("Edit.NavigateTo") can follow symbols in comments, whereas CTRL+F12 ("Edit.GoToImplementation") cannot. diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 4487f496..a0bfdd6c 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -5344,8 +5344,8 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l // - Double-click on label = Toggle on MouseDoubleClick (when _OpenOnDoubleClick=1) // - Double-click on arrow = Toggle on MouseDoubleClick (when _OpenOnDoubleClick=1 and _OpenOnArrow=0) // This makes _OpenOnArrow have a subtle effect on _OpenOnDoubleClick: arrow click reacts on Down rather than Up. - // It is rather standard that arrow click react on Down rather than Up and we'd be tempted to make it the default - // (by removing the _OpenOnArrow test below), however this would have a perhaps surprising effect on CollapsingHeader()? + // It is rather standard that arrow click react on Down rather than Up and we'd be tempted to make it the default + // (by removing the _OpenOnArrow test below), however this would have a perhaps surprising effect on CollapsingHeader()? // So right now we are making this optional. May evolve later. if (is_mouse_x_over_arrow && (flags & ImGuiTreeNodeFlags_OpenOnArrow)) button_flags |= ImGuiButtonFlags_PressedOnClick; @@ -5948,7 +5948,7 @@ int ImGui::PlotEx(ImGuiPlotType plot_type, const char* label, float (*values_get if (label_size.x > 0.0f) RenderText(ImVec2(frame_bb.Max.x + style.ItemInnerSpacing.x, inner_bb.Min.y), label); - // Return hovered index or -1 if none are hovered. + // Return hovered index or -1 if none are hovered. // This is currently not exposed in the public API because we need a larger redesign of the whole thing, but in the short-term we are making it available in PlotEx(). return idx_hovered; } diff --git a/misc/cpp/imgui_stdlib.cpp b/misc/cpp/imgui_stdlib.cpp index fda60f4d..cb1fe174 100644 --- a/misc/cpp/imgui_stdlib.cpp +++ b/misc/cpp/imgui_stdlib.cpp @@ -1,5 +1,4 @@ -// imgui_stdlib.cpp -// Wrappers for C++ standard library (STL) types (std::string, etc.) +// dear imgui: wrappers for C++ standard library (STL) types (std::string, etc.) // This is also an example of how you may wrap your own similar types. // Compatibility: diff --git a/misc/cpp/imgui_stdlib.h b/misc/cpp/imgui_stdlib.h index 5bccb032..f860b0c7 100644 --- a/misc/cpp/imgui_stdlib.h +++ b/misc/cpp/imgui_stdlib.h @@ -1,5 +1,4 @@ -// imgui_stdlib.h -// Wrappers for C++ standard library (STL) types (std::string, etc.) +// dear imgui: wrappers for C++ standard library (STL) types (std::string, etc.) // This is also an example of how you may wrap your own similar types. // Compatibility: diff --git a/misc/freetype/imgui_freetype.cpp b/misc/freetype/imgui_freetype.cpp index b4ef795a..69108e3e 100644 --- a/misc/freetype/imgui_freetype.cpp +++ b/misc/freetype/imgui_freetype.cpp @@ -1,4 +1,4 @@ -// Wrapper to use FreeType (instead of stb_truetype) for Dear ImGui +// dear imgui: wrapper to use FreeType (instead of stb_truetype) // Get latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype // Original code by @vuhdo (Aleksei Skriabin). Improvements by @mikesart. Maintained and v0.60+ by @ocornut. diff --git a/misc/freetype/imgui_freetype.h b/misc/freetype/imgui_freetype.h index d65c7724..619735c4 100644 --- a/misc/freetype/imgui_freetype.h +++ b/misc/freetype/imgui_freetype.h @@ -1,4 +1,4 @@ -// Wrapper to use FreeType (instead of stb_truetype) for Dear ImGui +// dear imgui: wrapper to use FreeType (instead of stb_truetype) // Get latest version at https://github.com/ocornut/imgui/tree/master/misc/freetype // Original code by @Vuhdo (Aleksei Skriabin), maintained by @ocornut diff --git a/misc/single_file/imgui_single_file.h b/misc/single_file/imgui_single_file.h index a556931c..6c849441 100644 --- a/misc/single_file/imgui_single_file.h +++ b/misc/single_file/imgui_single_file.h @@ -1,4 +1,4 @@ -// imgui_single_file.h +// dear imgui: single-file wrapper include // We use this to validate compiling all *.cpp files in a same compilation unit. // Users of that technique (also called "Unity builds") can generally provide this themselves, // so we don't really recommend you use this in your projects.