641 Commits (9733f4fa244a11e096440676810156975e6a4483)

Author SHA1 Message Date
ocornut 965fa3cb16 Version number 1.46 WIP 9 years ago
ocornut c9e19f8953 Version number 1.45 9 years ago
ocornut f195bf744f Tabs to spaces 9 years ago
ocornut 1eef2c9108 Comment 9 years ago
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246) 9 years ago
ocornut 65a191c005 Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc (#246)
GetCursorPos, SetCursorPos, GetContentRegionMax,
GetWindowContentRegionMin, GetWindowContentRegionMax are now including
the scrolling amount. It PROBABLY shouldn't break anything for you, but
take note that SetCursorPosX(100.0f) puts you at +100 from the starting
x position which may include scrolling, not at +100 from the window left
side.
9 years ago
ocornut d88b73a8b7 Added GetContentRegionAvailWidth() helper. Demo tweaks. 9 years ago
ocornut 0aa353868f Minor internal shortcuts not calling GetCurrentWindow() 9 years ago
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!) 9 years ago
ocornut 65fe60f2b2 Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) (#282) 9 years ago
ocornut 0a11024459 IO.WantInputCharacters -> WantTextInput (#305) 9 years ago
ocornut 30461345aa Removed default name parameter in Begin()
We already have a "Debug" window pushed to the stack in the first place
so it's not really a useful default.
9 years ago
ocornut 90e5c97f13 AddBezier()->AddBezierCurve(). PathBezierTo()->PathBezierCurveTo(), and reads current point back, more standard (#311) 9 years ago
ocornut 80ad773c87 ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves (#311) 9 years ago
ocornut e58f99179a Examples: OpenGL: fix for retina screens + io.DisplayFramebufferScale storage (#287) 9 years ago
ocornut a36001212f ImDrawData: added ScaleClipRects() helper (#287) 9 years ago
ocornut 59d498f3d0 Added ColorConvertU32ToFloat4() helper and ImColor(ImU32) constructor. 9 years ago
ocornut 8cf7df7ec4 Added GetWindowHeight() for completeness + BeginGroup() comment. 9 years ago
ocornut 08b345efd9 ImDrawList: Add comments on the usage of drawing channels 9 years ago
ocornut 77b82ecad7 ImDrawList: Fixed issues with channels split/merge. Functional without manually adding a draw cmd. + Removed unnecessary parameter to Channe 9 years ago
ocornut ad3c9f620d Tabs to spaces 9 years ago
ocornut 063d26a191 Removed obsolete comment 9 years ago
ocornut b1987d697f Trim trailing whitespace (#305) 9 years ago
ocornut 425c6cb3a3 Remove CaptureInputCharactersFromApp and minor cleanups (#305) 9 years ago
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
9 years ago
ocornut 97be3428f1 Added GetMousePosOnOpeningCurrentPopup(). 9 years ago
ocornut 07de0448f9 ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values 9 years ago
ocornut 307ed78006 ImGuITextBuffer: shallow tweak. 9 years ago
ocornut 42567a9516 ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer. 9 years ago
ocornut c98318a914 Renaming some argument to clarify the local vs screen coordinates 9 years ago
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.
9 years ago
ocornut 0c9fcdbe71 Allow to override ImDrawIdx type (#292) 9 years ago
ocornut aa3c26fd30 IM_PRINTFARGS takes one argument. Moved pragma outside of .h (#295) 9 years ago
ocornut b637850260 Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master 9 years ago
ocornut 14822609bd Version number 1.45 WIP 9 years ago
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions 9 years ago
ocornut a99ba42a39 Version number 1.44 9 years ago
ocornut a793ad682d Merge branch 'master' into 2015-07-cleanup
Conflicts:
	imgui.cpp
9 years ago
ocornut 7fea3eacfe Minor comments 9 years ago
ocornut 155873a6b0 Added GetContentRegionAvail() helper 9 years ago
ocornut 815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
9 years ago
ocornut 3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF() 9 years ago
ocornut e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 9 years ago
ocornut 1e76c63bb6 Fixed comment 9 years ago
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 9 years ago
ocornut 5a4b521855 Added ImDrawList::AddText() shorthand helper 9 years ago
ocornut 74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason 9 years ago
ocornut 82727d7119 Version number 1.44 WIP 9 years ago
ocornut cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window
Would be more useful with finer control over display layer
9 years ago
ocornut 20db726a9a Version number 1.44 WIP 9 years ago
ocornut e8cb874afe Version number 1.43 9 years ago
ocornut d6117e33d0 AddInputCharactersUTF8: shallow tweaks (#274) 9 years ago
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.
9 years ago
ocornut 5e846612d3 ImFont: tweaks 9 years ago
ocornut 3e3d9f9a69 ImFontAtlas: allow AddFontDefault to take a config 9 years ago
ocornut 815168c7ef ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242) 9 years ago
ocornut 6ae8062ca0 ImFont: comments, minor bits 9 years ago
ocornut c02f9b58ef ImFont: Cleanup to be compatible with over-sampling (not enabled) 9 years ago
ocornut ba9317b924 ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype 9 years ago
ocornut fbb9113118 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut 6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. 9 years ago
ocornut fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut b67593a4b1 Changed SameLine() parameters from int to float. 9 years ago
ocornut 827ff970cd InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag 9 years ago
ocornut d2701727b9 InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification. 9 years ago
ocornut 245cf36522 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 890585cde8 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 08b1dd1035 Version number 1.43 WIP
Bits
9 years ago
ocornut 09e8c4ec11 AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133) 9 years ago
ocornut e5bea65582 Version number 1.42 9 years ago
ocornut 54c2665032 AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path (#133) 9 years ago
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 9 years ago
ocornut d35c1a9e66 AA branch: removed the 'thickness' parameter from ImDrawList::AddLine() 9 years ago
ocornut 87ebe95fd6 Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls (#125) 9 years ago
ocornut 3e4841765d ImDrawList: winodw draw lists destructed properly on Shutdown() 9 years ago
ocornut bfa7d86070 AA branch: further use of ImVector<> Data/Size 9 years ago
ocornut c3ced1bd71 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut 3869e10574 ImVector<> access to Size/Capacity/Data (#262) 9 years ago
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
9 years ago
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
9 years ago
ocornut 02dbcf5405 ImVector<> cannot be re-defined (#262) 9 years ago
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.
9 years ago
ocornut 0ff2a6ff64 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut d6987d1586 ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering. 9 years ago
ocornut c52cefa2c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 0676efd37f AA branch: added ImDrawData::DeIndexAllBuffers() helper (#254) 9 years ago
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 9 years ago
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 9 years ago
ocornut 2633325b9f Comments 9 years ago
ocornut 562aecdaa5 Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11) 9 years ago
ocornut 56553f33b8 AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes (#133) 9 years ago
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
9 years ago
ocornut d76bc3434e Added DragFloatRange2() DragIntRange2() helpers (#76) 9 years ago
ocornut e9b81dd5ab Comments 9 years ago
ocornut fd3c6067bf Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems (#255) 9 years ago
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user. 9 years ago
ocornut 6826ab3ffd Added GetKeyIndex() helper. 9 years ago
ocornut 42efc29def SetScrollFromCursorPos() -> SetScrollHere() (#150) final call ! 9 years ago
ocornut 4eba6cd470 Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). (#150) 9 years ago
ocornut b37a326163 Renamed GetScrollPosY() to GetScrollY(). (#150)
Necessary to reduce confusion along with other scrolling functions,
because positions (e.g. cursor position) are not equivalent to scrolling
amount.
9 years ago
ocornut 531d0ce7ce Moving tooltips and popup chunks of imgui.h below widgets (#219) 9 years ago
ocornut 0201fe6ed1 Comments 9 years ago
ocornut 9bedcb5304 Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content (#150) 9 years ago
ocornut bbc22ac8ca Comments + remove trailing comma 9 years ago
ocornut 90ec28f6de Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 9 years ago
ocornut e0da1e0658 Split into CaptureKeyboardFromApp() / CaptureMouseFromApp() 9 years ago
ocornut 77fad80e9f Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing 9 years ago
ocornut eaaab0120a Moved Inputs utilities to their own section in imgui.h + additional comments 9 years ago
ocornut b74d8e4c87 SetScrollPosHere() takes a y centering ratio and can be used to aim the top or bottom of the window (relate #150) 9 years ago
ocornut 067b7d909a Style: Added GrabRounding (works well with AA branch). Followup to #212 9 years ago
ocornut d3c0bfefb3 AA branch: render axis aligned rect bypassing the AA path 9 years ago
ocornut 47826830af Adding TitleBgActive color - still issues with popups/menus (#253) 9 years ago
ocornut 1318e1b74c AA branch: remove unused functions. 9 years ago
ocornut 4bb94a9e4d AA branch: more optimisations. 9 years ago
ocornut c3040dee35 AA branch: more inline. 9 years ago
ocornut 077285ae57 AA branch: tidying up, inline PathStroke PathFill 9 years ago
ocornut aaefe458df AA branch: cleanup 9 years ago
ocornut ebfe4637d4 Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
9 years ago
ocornut d57ee2458c AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion 9 years ago
ocornut 43dcd6ef47 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
9 years ago
ocornut 0bf90770b0 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut 4ac21aaa12 Version number 1.42 wip + todo list entries 9 years ago
ocornut ea2c824192 Version 1.41 9 years ago
ocornut 5436266963 Added SetNextWindowPosCenter() (#249) 9 years ago
ocornut 2a041cfbe1 Added GetGlyphRangesCyrillic() helper (#237) 9 years ago
ocornut fe17f6e735 Added modal window darkening of previous windows (#249) 9 years ago
ocornut 8c790a3234 BeginPopupModal() can have an optional close-window button (#249) 9 years ago
ocornut bce495c581 Added BeginPopupModal() with actual modal behaviour (WIP api) (#249) 9 years ago
ocornut f10bbbb851 Minor comment fix (#248) 9 years ago
ocornut 0b98d3eb26 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
9 years ago
ocornut 01cb0dc7f7 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
	imgui.h
9 years ago
ocornut 0884cb51cd Added IsKeyReleased() (#248), added keyboard & mouse state panel in the demo window 9 years ago
ocornut 68534c2319 Added IsMouseReleased() helper (#248) 9 years ago
ocornut d0ea5942a9 InputTextMultiline() can clip + BeginChildFrame() returns bool. (#200) 9 years ago
ocornut 0795a60c6b InputText() fixed multi-line selection clipping. (#200) 9 years ago
ocornut 748837acfd Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
Conflicts:
	imgui.h
9 years ago
ocornut a248575dea Text rendering can be finely clipped cpu-side on top and left axises (for #200) 9 years ago
ocornut 0df7b472c2 InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling 9 years ago
ocornut b360c83e92 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering 9 years ago
ocornut 7d860a0181 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
9 years ago
ocornut 6eb1fec7a9 ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent. 9 years ago
ocornut b503e5ee5b ImageButton() changed default bg_col parameter from (0,0,0,1) black to (0,0,0,0) tranparent + drawing frame even when no padding (#243) 9 years ago
ocornut 4f0fa58ff2 Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125 9 years ago
ocornut c82e72eecb Selectable() parameter comment 9 years ago
ocornut cf481e1a7b Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns (#125) 9 years ago
ocornut 0e04dfbad7 Added IsWindowHovered() helper. 9 years ago
ocornut 9928d19af1 Version 1.41 WIP 9 years ago
ocornut c603534d38 Version 1.40 9 years ago
ocornut a76eea85c8 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
9 years ago