Commit Graph

1440 Commits (727ca4bd17da6c07bf375e336062574cf1751f19)

Author SHA1 Message Date
ocornut b326c8fd1f Added GetCurrentWindowRead() for functions that don't write to the window
ocornut b994dd777a Fixed OpenPopup() accessing current window, effectively opening "Debug" on an empty window stack
ocornut 0aa353868f Minor internal shortcuts not calling GetCurrentWindow()
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
ocornut 64fcb5e568 TreeNode() fixed IsItemHovered() being inconsistent with visual behavior ()
ocornut 65fe60f2b2 Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ()
ocornut c381d58fb1 TreeNode(): arbitrary interaction padding after text label not part of layout ()
ocornut 0a11024459 IO.WantInputCharacters -> WantTextInput ()
ocornut b803d284c3 InvisibleButton() honor negative size consistently with other widgets that do so
ocornut 80ad773c87 ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves ()
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage ()
ocornut 8b225923f8 Malformed UTF-8 don't terminate string, output 0xFFFD ()
ocornut 59d498f3d0 Added ColorConvertU32ToFloat4() helper and ImColor(ImU32) constructor.
ocornut 8cf7df7ec4 Added GetWindowHeight() for completeness + BeginGroup() comment.
ocornut 77b82ecad7 ImDrawList: Fixed issues with channels split/merge. Functional without manually adding a draw cmd. + Removed unnecessary parameter to Channe
ocornut ad00d88923 Window clipping rect fixes (for child windows with borders among others)
ocornut f0aca186cc Comments
ocornut ad3c9f620d Tabs to spaces
ocornut 466f01b313 Fixed child windows with the ImGuiWindowFlags_NoMove flag not taking direct focus
ocornut 43d073db1e Metrics: showing some internal state
ocornut b76353bbb1 Passing ImGuiWindowFlags_NoMove to BeginChild() allows to inhibit moving root window from this child
ocornut b1987d697f Trim trailing whitespace ()
ocornut 425c6cb3a3 Remove CaptureInputCharactersFromApp and minor cleanups ()
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
ocornut b28858b33b InputText: intentionally ignore character input when ctrl/alt are held (not sure if correct) ()
ocornut bbced3f0f0 Build fix
ocornut 4ac4d1ac37 ImHash: defaults seed to zero + comment.
ocornut 97be3428f1 Added GetMousePosOnOpeningCurrentPopup().
ocornut ede5956b28 Metrics window: shows indices along with triangles count ()
ocornut 07de0448f9 ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values
ocornut 42567a9516 ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
ocornut 72d3fca52f Demo: added simple Log demo
ocornut c98318a914 Renaming some argument to clarify the local vs screen coordinates
ocornut f421f2f47e IsWindowHovered() takes account of window hoverability (may be disabled because of a popup) + comment
Was a dupe of IsMouseHoveringWindow() anyway, they are now "clearly"
different.
ocornut 0c9fcdbe71 Allow to override ImDrawIdx type ()
ocornut 915b46f1c1 Added assert on index overflow ()
ocornut 48ed0a10d7 Minor code compaction (following )
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments
ocornut b637850260 Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master
ocornut 14822609bd Version number 1.45 WIP
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions
ocornut a99ba42a39 Version number 1.44
ocornut 27961401c6 Cleanup ()
ocornut 88a00f77e9 Cleanup - using ImRect more consistently for ImGui-side cliprect data
ocornut f1fb62fa6d Cleanup - shuffle functions around ()
Jonathan Adamczewski 0911597550 Remove inline qualifiers inside .cpp
Use of inline in the .cpp file causes link errors with gcc.
ocornut 15cfa63e97 Comments
ocornut 692a38c0fc Merge branch 'master' into 2015-07-cleanup
ocornut f2b652a39e Comments
ocornut e7f1e28b6b Merge branch 'master' into 2015-07-cleanup
ocornut 4b4f6d78ee InputFloat() fixed 0 decimal_precision
ocornut a54995eace RoundScalar() fallback use powf(10.f, -x) instead of 1.0f/powf(10.0f,x)
ocornut 9b19f8c19d Merge branch 'master' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut f6e21b7ab7 InputInt() also hexadecimal input (awkwardly via ImGuiInputTextFlags_CharsHexadecimal but we will allow fmt string in InputInt* later)
+ Fix for large ints constant assignment
ocornut cc8ff4c8d1 RoundScalar() use a lookup table to avoid calling powf(10.0f, x);
ocornut f0f2afa87d InputInt() doesn't cast to float, fix handling lost of precision with large integer. Added primitives to support more data types.
ocornut a793ad682d Merge branch 'master' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut ebd25cf1a3 Minor comments
ocornut e20b90154c Comments
ocornut 3ee2fac892 Slider: fixed using FramePadding between frame and grab visual. Scaling that spacing would look odd.
ocornut e42bec5ba2 Fixed scaling of checkbox and radio button for the filling of "active" visual
ocornut 155873a6b0 Added GetContentRegionAvail() helper
ocornut 60b46cc712 Comment ()
ocornut 815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()
ocornut da3baebd43 Fixed lower-right resize grip hit box not scaling along with its rendered size ()
ocornut 4b29cc9e10 Exposed relevant functions in imgui_internal.h ()
ocornut 26a992c6f6 Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix )
ocornut 6c63d80aa4 Tidying up InputTextApplyArithmeticOp()
ocornut f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up
ocornut faa609a43c Internal cleanup ParseFormatPrecision() doesn't take a reference
ocornut f8646338c3 Merge remote-tracking branch 'origin' into 2015-07-cleanup
ocornut 7650d4cc67 Internal SliderFloatAsInputText() -> InputFloatReplaceWidget()
ocornut abf823c6f6 Tidying up
ocornut 58ee08f214 Todo list notes
ocornut 040f3950a3 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut e6b29b70b4 Make internal SliderFloatAsInputText() take a size to match the calling widget
ocornut c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (, also ref )
ocornut a79ee94fc4 Removed unnecessary assignment + added comment
ocornut 709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex)
ocornut fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set.
Xo Wang 8d45c89352 Remove non-text character at start of imgui.cpp
ocornut 4468ec001e Fixed warning in console example (we're iterating chars)
ocornut fb83323b1d Tidying up
ocornut 62c888177a Tweaks
ocornut 7552f48d7b ImLoadFileToMemory() default parameters
ocornut 94f085aa3e Update comments ()
ocornut e32f0931e8 Missing includes for imgui_draw.cpp ()
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ()
ocornut 60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. ()
ocornut 83ebbebadd Fixed inconsistent declaration of ImVec2 privates operators
ocornut 5a4b521855 Added ImDrawList::AddText() shorthand helper
ocornut 74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason
ocornut 479211808f ImDrawList::AddPolyLine() tidying up in AA path
ocornut cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window
Would be more useful with finer control over display layer
ocornut 0ab620c2b9 Combo() clamp popup to lower edge of visible area
ocornut 20db726a9a Version number 1.44 WIP
ocornut 4015414978 InputtextMultiline(): honor negative size consistently with other widgets
ocornut 3b53a6513a Button() honor negative size consistently with other widgets that do so
ocornut eca26ae91d Build fix for MinGW ()
ocornut 99c5f5735c Tweak button sizes
ocornut e8cb874afe Version number 1.43
ocornut 1266e4a181 Added a gratuitous About window
ocornut d6117e33d0 AddInputCharactersUTF8: shallow tweaks ()
Daniel Gibson be8fb858cc Add ImGuiIO::AddInputCharactersUTF8(char* utf8str)
It'll convert the utf8 string to ImWchar's and passes each of them
to AddInputCharacter().

Very handy for SDL2 SDL_TEXTINPUT events, which provide a buffer with an
UTF-8 string.
ocornut 3ff04c95d5 Minor tweaks
ocornut d170620816 Comments
ocornut 80276ef07b Fixed ClearInputData()
ocornut 6c3ab6fc9b ImFont: fixed minor bug with CPU-side vertical clipping of text.
ocornut a56768463a Examples: moved demo bits around.
ocornut d750df9189 Fix for Shutdown()
ocornut baa2328b99 Tweak to RenderCheckMark()
ocornut 8081e81e55 Fixed warnings + label
ocornut 1a3ef63132 Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading)
Thanks Coverity
ocornut 368d2c3568 OverlayDrawList readier for pushing elements (not exposed yet)
ocornut 035ff302d2 ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont()
ocornut 95f489ac1f Merged AA branch in master! ()
ocornut 3e3d9f9a69 ImFontAtlas: allow AddFontDefault to take a config
ocornut 99a92ee7c5 Comments (fixed old comments)
ocornut 8952b93b2f Include for alloca()
ocornut fcec337061 Examples: Simplified font examples comments.
ocornut 815168c7ef ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (, , , )
ocornut 6ae8062ca0 ImFont: comments, minor bits
ocornut c02f9b58ef ImFont: Cleanup to be compatible with over-sampling (not enabled)
ocornut fc6545830b Examples: displaying more font information.
ocornut faec745438 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 8cfd963fda Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus ()
ocornut 355cbf6326 Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window ()
ocornut 52c820e7b0 Metrics: more details in popup stack ()
ocornut ba9317b924 ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype
ocornut 5b053dd350 Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway)
ocornut 7eca4e2a7f Merge bits
ocornut fbb9113118 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 4565bf9813 Demo: custom rendering example uses AddRectFilledMultiColor()
ocornut 6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
ocornut 7a0004eb86 Revert
ocornut d10d0343b2 Plot() function can take 0.0f for both scale_min/scale_max to calculate scale
ocornut e681937f66 Delete merging artefact that survived for a day
ocornut fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut b67593a4b1 Changed SameLine() parameters from int to float.
ocornut 8094aa78d2 Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()
ocornut 827ff970cd InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
ocornut d2701727b9 InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
ocornut 398ef1a212 Comments
ocornut 245cf36522 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 890585cde8 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 08b1dd1035 Version number 1.43 WIP
Bits
ocornut fec09e37ab Disable warnings, undo f4aae6b9ec ( )
Stephan Dilly f4aae6b9ec fix minor clang-x64 warnings
fixes 
ocornut e5bea65582 Version number 1.42
ocornut b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 44c23e0eed Allowing DeltaTime==0.0f to not assert
ocornut 67d93156df Fixed clang/gcc warnings ()
ocornut 54c2665032 AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path ()
ocornut 439040bb25 AA branch: more comments on breaking changes ()
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ()
ocornut d35c1a9e66 AA branch: removed the 'thickness' parameter from ImDrawList::AddLine()
ocornut ac56e4e209 AA branch: API breaking change documentation
ocornut af7f35d7c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 87ebe95fd6 Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls ()
ocornut f4fc008a2a Fixed ListBoxHeader() not honoring negative sizes the same way as BeginChild() or BeginChildFrame() ()
ocornut acf58c6223 More debug-build friendly ImVector<> use micro optimisations for the most bottle-neck bunchs
ocornut bfa7d86070 AA branch: further use of ImVector<> Data/Size
ocornut c3ced1bd71 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 3869e10574 ImVector<> access to Size/Capacity/Data ()
ocornut 25882c47a3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. ()
May trigger new compilation warnings?
ocornut aeae03f4ac Fixed minor zealous Clang warning (demo code intentionally uses strdup() to be copiable)
ocornut 4d42760c0b Metrics window: "Show clipping rectangles when hovering ImDrawList" enabled by default
ocornut de6dfe8c5d ImRect (internal) fixed ImVec4 constructor, argh (broken e7e2fcdd19)
ocornut 92b61d2ee4 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut b92396b46a Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value
ocornut 6a22835f63 AA branch: ImDrawList: rename commands to cmd_buffer
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
ocornut e7e2fcdd19 ImRect (internal) made constructors more non-optimised compilation friendly
ocornut a17e47fe14 ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands
ocornut 5782c69c2a Metrics window: calculate bounding box of actual vertices when hovering a draw list.
ocornut 9db4b35168 Fixed ImRect.Add(ImVec2&) which was broken and somehow unused
ocornut 0ff2a6ff64 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut d6987d1586 ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.
ocornut c52cefa2c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 0d5e6e125c Documentation ( )
ocornut 0676efd37f AA branch: added ImDrawData::DeIndexAllBuffers() helper ()
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( )
ocornut 2633325b9f Comments
ocornut 562aecdaa5 Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
ocornut 3fa4451936 PlotLines(), PlotHistogram(): fixed incorrect hovering test (would trigger tooltip when menu is open)
ocornut 1c160adbba Comments
ocornut c9676554b9 MenuItem() can be activated on release ()
ocornut 56553f33b8 AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes ()
ocornut 19e59421e5 AA branch: comments, inlining minor ops
ocornut 46c440d186 AA branch: AddPolyline() stores normals on stack
ocornut c09af38804 AA branch: AddConvexPolyFilled() store normals on stack
ocornut a74ca9025f AA branch: oops, ImInvLengthSqr() is ImInvLength()
ocornut a8b5f77591 AA branch: AddPolyline(), AddConvexPolyFilled() a little more readable with more consistent naming
ocornut 0292c82b9c AA branch: fix lower-right bound of frame outlines
ocornut 2f21347803 CollapsingHeader() fixed label rendering outside in columns context where cliprect max isn't aligned with header
ocornut 7959fbe992 AA branch: CollapsingHeader() rounding down half window padding
ocornut f04c2002d6 AA branch: fixed column offsets not always aligned to the pixel causing CollapsingHeader() border to incorrectly anti-alias
Fixing framed CollapsingHeader() inside columns, where
GetContentRegionMax() doesn't return pixel aligned rounded position.
ocornut 0d7ca3da24 AA branch: AddLine() api adds the 0.5f offset (unsure about that yet)
ocornut 18fa8e1c7e Fixed IsMouseDragging() (fix )
ocornut 3b94c37efc AA branch: minor tweaks + disabled debug code that disable AA when holding Ctrl
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
ocornut d76bc3434e Added DragFloatRange2() DragIntRange2() helpers ()
ocornut 7437b43b2d Fixed warnings for more pedantic settings ()
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 6826ab3ffd Added GetKeyIndex() helper.
ocornut 0f9e2f8173 Tweaked scrolling example code ()
ocornut 42efc29def SetScrollFromCursorPos() -> SetScrollHere() () final call !
ocornut 4eba6cd470 Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). ()
ocornut b37a326163 Renamed GetScrollPosY() to GetScrollY(). ()
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
ocornut 9bedcb5304 Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content ()
ocornut 1b01137c90 Fixed text baseline alignment of small button (no padding) after regular buttons
Currently being a coward and only doing it via the SmallButton() entry
point.
ocornut bbc22ac8ca Comments + remove trailing comma
ocornut 90ec28f6de Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut e0da1e0658 Split into CaptureKeyboardFromApp() / CaptureMouseFromApp()
ocornut 77fad80e9f Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing
ocornut 57f70a29b2 Fixed a bug with TextUnformatted() clipping of long text ()
ocornut 0e5b64ecd2 SetScrollPosHere() Minor hack for effective "scroll to top" to appear like user expect it ()
Compensate the difference between WindowPadding and ItemSpacing
ocornut 824cf5ae85 Fixed window padding being reported incorrectly for child windows with borders when parent have no borders
ocornut 3d7b596a40 SetScrollToPosHere() fixed imprecision + handling lower gap better for bottom alignment ()
ocornut 49b7a8e61f Added scroll tracking example with SetScrollPosHere() (relate )
ocornut b74d8e4c87 SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate )
ocornut 067b7d909a Style: Added GrabRounding (works well with AA branch). Followup to
ocornut d3c0bfefb3 AA branch: render axis aligned rect bypassing the AA path
ocornut b30d08d63a AA branch: bits
ocornut c39372e7d5 Title bar uses TitleBgActive color even when window has popups/menus over ()
ocornut 47826830af Adding TitleBgActive color - still issues with popups/menus ()
ocornut c71b183965 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 4bb94a9e4d AA branch: more optimisations.
ocornut a8f0eb5ec6 AA branch: more optimisations.
ocornut bbdf36cd3a AA branch: minor optimisations, merging loops
ocornut c3040dee35 AA branch: more inline.
ocornut 077285ae57 AA branch: tidying up, inline PathStroke PathFill
ocornut aaefe458df AA branch: cleanup
ocornut ebfe4637d4 Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
ocornut d57ee2458c AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion
ocornut 5bf30bd6c4 AA branch: Minor optimisations for Debug builds
ocornut 43dcd6ef47 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
ocornut 0bf90770b0 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
ocornut 0e3198edc2 Tidying up - renamed FindBestWindowPos() to FindBesttPopupWindowPos()
ocornut af0de5f357 Tidying up - ImRect doesn't use ImVec2 operators (so we can expose it later)
ocornut 882c7a8cef Tidying up - ShowUserGuide, ShowStyleEditor only uses public calls
ocornut 039ebb79f4 Tidying up - renamed a few internal functions
ocornut 8b392feba1 Tidying up - moved ImFontAtlas glyph ranges helpers outside of ImFont block
ocornut 0783697f87 Minor tidying up
ocornut 4ac21aaa12 Version number 1.42 wip + todo list entries
Ben Vanik 5cd1a01514 Fixing 64-bit compilation warning caused by implicit size_t->int cast