ocornut
502e360ee5
Removed the majority of size_t from the code. ImVector<> now uses int. ( #262 )
...
May trigger new compilation warnings?
10 years ago
ocornut
02dbcf5405
ImVector<> cannot be re-defined ( #262 )
10 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.
10 years ago
ocornut
0ff2a6ff64
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
d6987d1586
ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering.
10 years ago
ocornut
c52cefa2c2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
0676efd37f
AA branch: added ImDrawData::DeIndexAllBuffers() helper ( #254 )
10 years ago
ocornut
b2b616be00
AA branch: ImDrawCmd idx_count -> elem_count
10 years ago
ocornut
f3303fa84f
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( #133 #254 )
10 years ago
ocornut
2633325b9f
Comments
10 years ago
ocornut
562aecdaa5
Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11)
10 years ago
ocornut
56553f33b8
AA branch: added style.AntiAliasedLines, style.AntiAliasedShapes ( #133 )
10 years ago
ocornut
f435e42561
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
10 years ago
ocornut
d76bc3434e
Added DragFloatRange2() DragIntRange2() helpers ( #76 )
10 years ago
ocornut
e9b81dd5ab
Comments
10 years ago
ocornut
fd3c6067bf
Add conditional #ifdef prior to imconfig.h to facilitate inclusion in build systems ( #255 )
10 years ago
ocornut
b69d7d9df3
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
2f03511062
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
10 years ago
ocornut
6826ab3ffd
Added GetKeyIndex() helper.
10 years ago
ocornut
42efc29def
SetScrollFromCursorPos() -> SetScrollHere() ( #150 ) final call !
10 years ago
ocornut
4eba6cd470
Added SetScrollY(), SetScrollFromPosY(). Renamed SetScrollPosHere() to SetScrollFromCursorPos(). ( #150 )
10 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.
10 years ago
ocornut
531d0ce7ce
Moving tooltips and popup chunks of imgui.h below widgets ( #219 )
10 years ago
ocornut
0201fe6ed1
Comments
10 years ago
ocornut
9bedcb5304
Added GetCursorStartPos() necessary for using scroll target relative to beginning of window content ( #150 )
10 years ago
ocornut
bbc22ac8ca
Comments + remove trailing comma
10 years ago
ocornut
90ec28f6de
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
e0da1e0658
Split into CaptureKeyboardFromApp() / CaptureMouseFromApp()
10 years ago
ocornut
77fad80e9f
Added CaptureInputsFromApp() to manually enforce e.g. keyboard capturing
10 years ago
ocornut
eaaab0120a
Moved Inputs utilities to their own section in imgui.h + additional comments
10 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 )
10 years ago
ocornut
067b7d909a
Style: Added GrabRounding (works well with AA branch). Followup to #212
10 years ago
ocornut
d3c0bfefb3
AA branch: render axis aligned rect bypassing the AA path
10 years ago
ocornut
47826830af
Adding TitleBgActive color - still issues with popups/menus ( #253 )
10 years ago
ocornut
1318e1b74c
AA branch: remove unused functions.
10 years ago
ocornut
4bb94a9e4d
AA branch: more optimisations.
10 years ago
ocornut
c3040dee35
AA branch: more inline.
10 years ago
ocornut
077285ae57
AA branch: tidying up, inline PathStroke PathFill
10 years ago
ocornut
aaefe458df
AA branch: cleanup
10 years ago
ocornut
ebfe4637d4
Merge branch '2015-04-indexed-rendering' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
d57ee2458c
AA branch: ImDrawList: renaming of Path based functions so both code paths can cohabit with no confusion
10 years ago
ocornut
43dcd6ef47
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
10 years ago
ocornut
0bf90770b0
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
4ac21aaa12
Version number 1.42 wip + todo list entries
10 years ago
ocornut
ea2c824192
Version 1.41
10 years ago
ocornut
5436266963
Added SetNextWindowPosCenter() ( #249 )
10 years ago
ocornut
2a041cfbe1
Added GetGlyphRangesCyrillic() helper ( #237 )
10 years ago
ocornut
fe17f6e735
Added modal window darkening of previous windows ( #249 )
10 years ago
ocornut
8c790a3234
BeginPopupModal() can have an optional close-window button ( #249 )
10 years ago
ocornut
bce495c581
Added BeginPopupModal() with actual modal behaviour (WIP api) ( #249 )
10 years ago
ocornut
f10bbbb851
Minor comment fix ( #248 )
10 years ago
ocornut
0b98d3eb26
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
10 years ago
ocornut
01cb0dc7f7
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
0884cb51cd
Added IsKeyReleased() ( #248 ), added keyboard & mouse state panel in the demo window
10 years ago
ocornut
68534c2319
Added IsMouseReleased() helper ( #248 )
10 years ago
ocornut
d0ea5942a9
InputTextMultiline() can clip + BeginChildFrame() returns bool. ( #200 )
10 years ago
ocornut
0795a60c6b
InputText() fixed multi-line selection clipping. ( #200 )
10 years ago
ocornut
748837acfd
Merge remote-tracking branch 'origin' into 2015-06-multiline_textedit
...
Conflicts:
imgui.h
10 years ago
ocornut
a248575dea
Text rendering can be finely clipped cpu-side on top and left axises (for #200 )
10 years ago
ocornut
0df7b472c2
InputTextMultiline() WIP - still gazillion problems with selection visualisation & scrolling
10 years ago
ocornut
b360c83e92
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
10 years ago
ocornut
7d860a0181
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
6eb1fec7a9
ImFont: added GetCharAdvance() helper. Exposed font Ascent and font Descent.
10 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 )
10 years ago
ocornut
4f0fa58ff2
Selectable() changed prototype moved flags before size. size override should rarely have been used! sorry. #125
10 years ago
ocornut
c82e72eecb
Selectable() parameter comment
10 years ago
ocornut
cf481e1a7b
Selectable() added flags ImGuiSelectableFlags_DontClosePopups , ImGuiSelectableFlags_SpanAllColumns ( #125 )
10 years ago
ocornut
0e04dfbad7
Added IsWindowHovered() helper.
10 years ago
ocornut
9928d19af1
Version 1.41 WIP
10 years ago
ocornut
c603534d38
Version 1.40
10 years ago
ocornut
a76eea85c8
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
10 years ago
ocornut
ade7661b3f
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
1c2dac2a90
Version increased to 1.40 WIP makes more sense than 1.39 (changelog is huge)
10 years ago
ocornut
374d160234
BeginPopupContextWindow() in_empty_space_only -> !also_over_items ( #126 )+ comments
...
Sorry if you used this parameter already.
10 years ago
ocornut
eb4ffd5dbd
Added ImGuiListClipper helper to avoid using CalcListClipping() directly.
10 years ago
ocornut
df37df821e
RetWindowCollapsed() to IsWindowCollapsed() for consistency. Kept inline indirection.
10 years ago
ocornut
0539be7067
Added IMGUI_DISABLE_OBSOLETE_FUNCTIONS
10 years ago
ocornut
475498f2eb
Comments, moved Sliders below Drag & Input in imgui.h
10 years ago
ocornut
03ff2faacb
Comments
10 years ago
ocornut
c4cb768432
Comments
10 years ago
ocornut
9417df2a26
Renamed IsRectClipped to IsRectVisible for consistency. Note that return value is opposite! Kept inline redirection function (will obsolete)
10 years ago
ocornut
f0781d3a24
Added GetItemsLineHeightWithSpacing() helper.
10 years ago
ocornut
dcc7df2b21
Added BeginPopupContextVoid() helper for completeness ( #126 )
10 years ago
ocornut
1cb6a294b0
BeginPopupContextWindow() rearranged and clarified parameters ( #126 )
10 years ago
ocornut
938528e5ee
Added BeginPopupContextItem() / BeginPopupContextWindow() ( #126 )
10 years ago
ocornut
8c4c421f74
Added IsAnyItemHovered() public helper.
10 years ago
ocornut
3d36c81241
Added PushButtonRepeat() / PopButtonRepeat(). REMOVED third 'repeat_if_held' parameter of Button() !
10 years ago
ocornut
d69f2f57ee
Added configurable io.KeyRepeatDelay, io.KeyRepeatRate
10 years ago
ocornut
f841097e99
Button centering left to RenderTextClipped function.
10 years ago
ocornut
b8ee48a74b
OpenPopup() Comments
10 years ago
ocornut
6f32684f15
Examples: various usage comments.
10 years ago
ocornut
15113f682e
Added TextDisabled(), TextDisabledV() helpers.
10 years ago
ocornut
3a6e6645e6
WIP Menus: Fixed remaining inconsistency with stacks of popups. Activating/closing a menu close the parent popup. Added test case. ( #126 )
10 years ago
ocornut
6b3ccd3edf
WIP Menus: Added support for disabled sub-menu ( #126 )
10 years ago
ocornut
0db122bc3b
Comments. Examples: added empty if (MenuItem()) {} statements in more places to better document the typical use cases ( #126 )
10 years ago
ocornut
fd0108dbef
Comments
10 years ago
ocornut
3498617a3c
Comments.
10 years ago
ocornut
14bcfef041
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.cpp
10 years ago
ocornut
8cfae35042
Added Dummy() helper
10 years ago
ocornut
89d1340225
WIP Menus: Added Enabled/Disabled option for MenuItem() ( #126 )
10 years ago
ocornut
485832fe06
WIP Menus: Added BeginMainMenuBar()/EndMainMenuBar() helpers. Added to examples.
10 years ago
ocornut
e3f2ad728a
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
10 years ago
ocornut
cc3ed515ca
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
92ded00fd9
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
10 years ago
ocornut
da53caf310
Moved ImVector<> after the main block ( #219 )
10 years ago
ocornut
6da8a77fa3
WIP Menus: tidying up, fixed hovering in parent popup menu item from child popup (individual popups acts as hovering barrier) ( #126 )
10 years ago
ocornut
e674df8101
Merge remote-tracking branch 'origin' into 2015-05-menus
10 years ago
ocornut
0e8c2f9d41
Comments
10 years ago
ocornut
4bd43bdb35
Renamed ImGuiWindowFlags_Menu to ImGuiWindowFlags_ChildMenu
10 years ago
ocornut
f2b738648f
WIP Menus: menu bars. Still inconsistency with hovering scheme. Will probably follow what Windows does. ( #126 ).
10 years ago
ocornut
e0594340ff
Moved internal window flags to higher bit-count
10 years ago
ocornut
e9b6e437eb
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
1eafe86627
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
fa0f0f4507
ImVector: tweak growth strategy
10 years ago
ocornut
d9ca8f3145
Added IO.MetricsAllocs counter (number of memory allocations
10 years ago
ocornut
1e4c22c206
Added io.MetricsActiveWindows counter ( #213 )
10 years ago
ocornut
9d9cf31972
ImFontAtlas: added ClearFonts(), making the different clear funcs more explicit ( #224 )
10 years ago
ocornut
30552ecfd6
Fixed comment ( fix #223 )
10 years ago
ocornut
356a37edcf
Added window title text horizontal alignment option ( #222 ),, ImGuiAlign_ type for future use.
10 years ago
ocornut
03720acaff
Merge remote-tracking branch 'origin' into 2015-05-menus
10 years ago
ocornut
9be3319653
Tweaks, comments around ImFontAtlas
...
Removed unsigned int from API
10 years ago
ocornut
9e307d60e3
Merge remote-tracking branch 'origin' into 2015-05-menus
10 years ago
ocornut
515e0c6122
Cleanup, merged duplicate code into a function
10 years ago
ocornut
5082182790
Merge remote-tracking branch 'origin' into 2015-05-menus
...
Conflicts:
imgui.h
10 years ago
ocornut
7fb704d308
WIP intermediary branch commit for menus, submenus (some large inconsistencies remaining in API + need cleanup) ( #126 )
...
May remove the ImGuiWindowFlags_Menu alltogether
10 years ago
ocornut
34aad73fd8
Added ImGuiCol_TextDisabled
10 years ago
omar
33a2fd368a
Merge pull request #218 from paperManu/inputNFlags
...
InputFloat2/3/4, InputInt2/3/4: Added extra_flags parameter.
10 years ago
Emmanuel Durand
b3faed610d
Renamed flags to extra_flags in last commit
10 years ago
ocornut
fcd08ed8d4
BeginPopup() API had to be changed! :( Proper support for stacked popups, leading into menus (wip #126 )
10 years ago
Emmanuel Durand
94b7c9e307
Input text flags added to InputFloatN and InputIntN
10 years ago
ocornut
c2c43928a9
Untabifiy
10 years ago
ocornut
4913668ea4
Fixed implicit conversion of NULL constant to bool ( fix #216 )
10 years ago
ocornut
f293bec97c
Added style.ScrollbarRounding #212
10 years ago
ocornut
dd2a578012
Added ImGuiSetCond_Appearing to test the hidden->visible transition.
10 years ago
ocornut
f46557d2d6
MenuItem() draft for popups, with Selected option (wip #126 )
10 years ago
ocornut
85b8967291
Added RenderCheckMark() helper following the font size
...
Pretty ugly, not sure what's the right way to solve that automatically,
better shown as an "icon" so it doesn't have to necessarily look like
the font.
10 years ago
ocornut
e7ffcea33d
Removed style.AutoFitPadding, using style.WindowPadding makes more sense (the default values were already the same).
10 years ago
ocornut
f00662a5ad
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
10 years ago
ocornut
08fd6a7e7d
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
ocornut
221f36e116
Comments, tweaks, metrics window tweak
10 years ago
ocornut
07ebb14ce2
Tooltip: fit within display. Added style.DisplayWindowPadding, style.DisplaySafeAreaPadding now strictly for popups/menus.
10 years ago
ocornut
68ccdc4fb8
Comments
10 years ago
ocornut
8fbb42cc6f
Added IsKeyDown() IsMouseDown() as convenience instead of reading into IO structures
...
Also their existence serves as implicit documentation of what
IsKeyPressed(), IsMouseClicked() does
10 years ago
ocornut
c93a562b06
Added ImGuiStorage::GetVoidPtrRef()
10 years ago
ocornut
9119f58ce5
Version number 1.39 WIP
10 years ago
ocornut
0123fc8c0f
Removed comment
10 years ago
ocornut
064b94721e
Added DragFloat2, DragFloat3, DragFloat4, DragInt2, DragInt3, DragInt4.
10 years ago
ocornut
94c4e9564d
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
10 years ago
ocornut
86d1abf3f6
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
05ee36baab
Version number 1.38
10 years ago
ocornut
43cb4038c6
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
...
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
10 years ago
ocornut
0bb89ccee2
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
10 years ago
Stephan Dilly
b28ec1f3b1
fix outdated documentation
10 years ago
ocornut
dd36e8bf2b
Renamed IsClipped() to IsRectClipped(). Kept inline redirection function (will obsolete).
10 years ago
ocornut
d11b4160aa
Added IsItemVisible(). Made IsClipped() also return false when log is enabled.
10 years ago
ocornut
9918ec31d6
Added ResetMouseDragDelta() for iterative dragging operations
10 years ago
ocornut
a143e2e772
Added PushId() GetId() variants that takes string range to avoid user making unnecessary copies
10 years ago
ocornut
6ed06a8dc8
DragFloat() added power parameter for logarithmic drag on both side of zero #180
10 years ago
ocornut
f5ad362912
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
10 years ago
ocornut
0dc3d07e7f
DragInt() step given as float to allow finer control of speed #180
10 years ago
ocornut
62abde5b37
DragFloat() latch value internally, allows finer control, honor precision settings, slow step with integer works #180
10 years ago
ocornut
ac740170b9
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
10 years ago
ocornut
bff9a6b6e3
Added ImFontAtlas::AddFontFromCompressedTTF() helper + binary_to_compressed_c.cpp tool
10 years ago
ocornut
e0cd947904
AA branch: Fixes.
10 years ago
ocornut
1e69175403
AA branch: Test disabling aa at runtime for stroke and fill.
10 years ago
ocornut
14ddb81f7a
AA branch: remove code unnecessary for this branch.
10 years ago
ocornut
39445cf23a
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
1746b04065
Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
10 years ago
ocornut
500a8a0e02
ImDrawList: bits of renaming.
10 years ago
ocornut
4fa3eee84e
Renamed io.MetricsVertices to io.MetricsRenderVertices
10 years ago
ocornut
334fba2f56
Spacing
10 years ago
ocornut
707df6c7b7
ImDrawList: internal refactoring toward a following commit for indexed rendering.
10 years ago
ocornut
aa2935968e
Renamed AddArcFast() parameter 'tris' to 'filled'
10 years ago
ocornut
0fc1f5b17f
Revert AddArcFast()->AddArc(), removed modulo from function 200d3482dc
10 years ago
ocornut
200d3482dc
Renamed ImDrawList::AddArc() to ImDrawList::AddArcFast() for compatibility with future API, and changed 2*PI range from 0..12 to 0..16
10 years ago
Stephan Dilly
5ba77928ba
fix initialising ints with float literals
10 years ago
ocornut
323ae8326e
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
d692286862
Added ShowMetricsWindow()
10 years ago
ocornut
33ef3992f7
Added IO.MetricsVertices counter
10 years ago
ocornut
fe64da6197
Allow SetWindowFocus(NULL) to remove focus
10 years ago
ocornut
f5310a2f2d
Comments
10 years ago
ocornut
28a45877aa
DragFloat() comment examples, not ready for prime-time #180
10 years ago
ocornut
916a8955ec
DragFloat(): passing min>=max (e.g. 0.0f) for range makes the drag unbound #180 , removed extra APIs
10 years ago
ocornut
1247ce251f
Added DragFloat(), DragInt() work in progress #180
10 years ago
ocornut
e6792f84d4
Comments and organization of imgui.h
10 years ago
ocornut
503b8c20de
Delete font clear pointer in ImGui state to get a clear crasah instead of a dangling pointer. #181
10 years ago
ocornut
e03d2b2900
ImVec2/ImVec4 no-parameters constructs init to 0.0f. Saner. Couldn't measure perf differences in a simple stress test compiled in Debug mode
10 years ago
ocornut
bb385fabd4
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
e16f2e898a
Version number 1.38 WIP
10 years ago
ocornut
26991bb2ec
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
a1582874d3
Changed new ImDrawList::AddLine() half_thickness to hickness, just in time for release
10 years ago
ocornut
729e524955
Version number 1.37
10 years ago
ocornut
e1de4908f6
Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up.
10 years ago
ocornut
91f8eb7b92
Added early version of BeginPopup/EndPopup() #126
10 years ago
ocornut
7e334013a0
Selectable(const char*, bool) version has bool defaulting to false
10 years ago
ocornut
743c815821
Renamed IsItemHoveredRectOnly -> IsItemHoveredRect (introduced after previous release)
10 years ago
ocornut
8b7668d24f
Avoid negative clipping rectangle when collapsing windows, ImDrawList could still submit data #177
10 years ago
ocornut
b04ee7e040
Added a more convenient three parameters version of Begin() which Flags more accessible.
10 years ago
ocornut
e176a8b93f
OCD normalising function comments not ending with a comma
10 years ago
ocornut
85f432dc8d
Commented standard library include with the functions we use. Using ImFormatString in place of sprintf (part of #172 )
10 years ago
ocornut
b024ff85f7
Fixed comment
10 years ago
ocornut
810fcd8bcb
Added mouse cursor types handling + embed mouse cursor data #155
10 years ago
ocornut
d77082af00
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
92a22ab35f
Shutdown() freeing a few extra vectors so they don't have to freed by destruction #169
10 years ago
ocornut
4cd438f663
Added IsMouseDragging(), GetMouseDragDelta() given button and lock threshold. added io.MouseDragThreshold setting. ( #167 )
...
Removed GetItemActiveDragDelta()
10 years ago
ocornut
2d29907611
Added GetMouseDragDelta() helper. No unlock threshold yet ( #167 )
10 years ago
ocornut
138e292c4b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
7a2da7cd02
Added style.DisplaySafeAreaPadding which was previously hard-coded (for use if you can't see the edges of your display, e.g. TV screens)
10 years ago
ocornut
ed0f0dbe87
ImDrawList::AddText() takes a const ImFont*
10 years ago
ocornut
dcaafffe0e
Added CalcItemRectClosestPoint() helper.
10 years ago
ocornut
9f1b407def
ImDrawList: added thickness param to AddLine(). Added PushClipRectFullScreen() helper.
10 years ago
ocornut
7d26e85b05
IsItemHovered() return false if another widget is active. Added IsItemHoveredRectOnly().
10 years ago
Adam D. Moss
1de735ba7c
GetItemBoxMax: fix obsolete function copy-n-paste bug
10 years ago
ocornut
e10d648a28
Added ImGui::GetItemActiveDragDelta() helpers for drag operations
10 years ago
ocornut
215b0065e3
Version number 1.37 WIP
10 years ago
ocornut
7665b8e5e7
Version number
10 years ago
ocornut
d8026e4d84
Added VSliderInt()
10 years ago
ocornut
be83c07957
Changed mentions of 'box' to be 'rect'
10 years ago
ocornut
7e297945c3
Added BeginGroup() / EndGroup() layout tools ( #160 )
10 years ago
ocornut
da4bfe3289
Added GetItemRectSize(). Renamed GetItemRectMin()/GetItemRectMax()/IsMouseHoveringBox() to GetItemRectMin()/GetItemRectMax()/IsMouseHovering
10 years ago
ocornut
ea720963cf
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
0fc9168439
Added InputInt2(), InputInt3(), InputInt4()
10 years ago
ocornut
44826972c0
Added Indent(), Unindent()
10 years ago
ocornut
edde703f8f
Renamed style.TreeNodeSpacing to style.IndentSpacing, ImGuiStyleVar_TreeNodeSpacing to ImGuiStyleVar_IndentSpacing
10 years ago
ocornut
1ac4f33736
Added VSliderFloat()
10 years ago
ocornut
98eeeab025
Added ImGuiStyleVar_GrabMinSize enum value for PushStyleVar()
10 years ago
ocornut
4d78c5c9ab
Comments and reduced ImGuiTextEditState.InitialText[] to 3 KB (assuming average use case of UTF-8 uses 3 bytes charracters)
10 years ago
ocornut
1c1a55f6b1
Added IsRootWindowFocused(), IsRootWindowOrAnyChildFocused(). Renamed GetWindowIsFocused() to IsWindowFocused()
10 years ago
ocornut
0911526424
Added io.KeyAlt + support in examples apps
...
Currently unused but supported by sample so that more people will have
it set up when menus needs them
10 years ago
ocornut
58dc3f97c5
WIP marker in uppercase.. ( #127 )
10 years ago
ocornut
5d1c381509
Update version number, added IMGUI_VERSION, ImGui::GetVersion() ( #127 )
10 years ago
ocornut
378eee490b
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
10 years ago
ocornut
d440a13b7e
Version number
10 years ago
ocornut
32312e538e
Renamed style.ScrollBarWidth to style.ScrollbarWidth to be consistent with other casing.
10 years ago
ocornut
2af8e0238c
Added GetScrollPosY(), GetScrollMaxY() (mentioned in #150 )
10 years ago
ocornut
a5daea9408
Added style.GrabSizeMin
10 years ago
ocornut
849c72c5c3
Forward declare struct in imgui.cpp. Removed two forward declarations leaking in imgui.h
10 years ago
ocornut
e01500f046
Added comments on columns function; Added GetColumnIndex(), GetColumnsCount(), #154
10 years ago
ocornut
8ca3dc8e41
Merge: First pass on AA rendered primitives from https://github.com/memononen/imgui
10 years ago
ocornut
e269125c3a
Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
...
User need to set io.ImeWindowHandle
10 years ago
ocornut
0ffd99d319
Font: fix for fallback character width.
10 years ago
ocornut
8691c5ca42
Version number + commented failing test case
10 years ago
ocornut
f4458f7571
Version number
10 years ago
ocornut
40b04a3701
Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
10 years ago
ocornut
2177b11682
Added SetNextTreeNodeOpened() with optional condition flag in replacement of OpenNextNode()
10 years ago
ocornut
ea17240b96
Spacing
10 years ago
ocornut
ebe363c951
Added SetWindowPos(), SetWindowSize(), SetWindowCollaposed() given a wnidow name.
10 years ago
ocornut
6d89285f59
Added SetWindowFocus(), SetWindowFocus(const char*), SetNextWindowFocus() ( #146 )
10 years ago
ocornut
fe48562171
Comments for IMGUI_API
10 years ago
ocornut
c51be42f28
Added Bullet() + usage examples
10 years ago
ocornut
0df8ff6931
Version number
10 years ago
ocornut
e022e5cff6
Version number 1.33
10 years ago
ocornut
bab81318a9
Comments and changed ImVec2 parameters to const ImVec2&
10 years ago
ocornut
835a46effb
Comments
10 years ago
ocornut
00e281bef1
Version number
10 years ago
ocornut
242a52abba
InputText: minor tidying up.
10 years ago
ocornut
2f9ef13be3
Comments
10 years ago
ocornut
4deeaea93c
BeginChild() return a bool analoguous to Begin(). if true you can skip submitting content.
10 years ago
ocornut
f2752584e2
Added IsAnyItemActive()
10 years ago
ocornut
c1f20f03c5
ImGuiTextFilter() can take a default filter string
10 years ago
ocornut
dbdbaec3eb
Version number + comment
10 years ago
ocornut
cb0a4db048
Calculate frame-rate for the user, as a purely luxurious feature
...
..and to reduce sample code size a little.
10 years ago
ocornut
a597664672
Added ImGuiInputTextFlags_CharsNoBlank stock filter. Tweak examples.
10 years ago
ocornut
2df4735904
ImGuiInputTextFlags_CallbackCharFilter can return 1 to filter character
10 years ago
ocornut
b73484a66b
Added ImGuiInputTextFlags_CharsUppercase stock filter
10 years ago
ocornut
9473cd491e
InputText(): added ImGuiInputTextFlags_CallbackCharFilter system for filtering/replacement. Callback now passed an "EventFlag" parameter.
10 years ago
ocornut
1da8a52ce7
CalcTextSize*() functions which are often speed bottleneck for large contents are about 25% faster.
...
Caching character advance contiguously, pulled inline, no int->float
conversion.
10 years ago
ocornut
6347179bb0
Added ListBox() ( #129 )
...
Along with ListBoxHeader(), ListBoxFooter() helpers.
10 years ago
ocornut
c26af284db
Tweaks. Combo default height_in_items is -1 at compilation time to match incoming ListSelect() behavior
10 years ago
ocornut
801ed2c472
Allow passing -0.01f to PushItemWidth() for a perfect right-side alignment + fix CalcItemWidth()
10 years ago
ocornut
e7f51172c1
BeginChildFrame() / EndChildFrame() helpers.
10 years ago
ocornut
1e9f6cce7f
PushItemWidth() can take negative value to right-align items. Renamed GetItemWidth() to CalcItemWidth()
10 years ago
ocornut
8532da3f52
Added BeginChild() variant that takes an ImGuiID
10 years ago
ocornut
c6d42b1a54
Added Selectable() building block for various list boxes, combo boxes
10 years ago
ocornut
da2f5d9c48
Added ImGuiCol_ChildWindowBg, ImGuiStyleVar_ChildWindowRounding for completeness and flexibility
...
Upcoming features using it.
10 years ago
ocornut
8e8cb7de3f
Fixed title bar text clipping issue ( fix #128 )
...
+ Update version number
10 years ago
ocornut
734cf47e71
Version number
10 years ago
ocornut
c907108c23
SetNextWindowPos api before SetWindowPos api in .h + comments
10 years ago
ocornut
f84166dda9
Use cpu-side clipping instead of a new draw call for isolated label-clipped-by-frame cases.
10 years ago
ocornut
9e3f8adfac
Added CalcListClipping() helper.
10 years ago
ocornut
29e0aad739
Renamed GetTextLineSpacing to GetTextLineHeightWithSpacing. Added GetCursorPosX/GetCursorPosY
10 years ago
Václav Patejdl
d135d91e27
Added tint_col parameter to ImageButton
10 years ago
ocornut
209ab823d6
Cleanup of previous merge. Moved rarely used Get/Set InternalState functions to the bottom of the list to avoid being misleadnig.
10 years ago
ocornut
e36fad65dd
Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
...
Conflicts:
imgui.cpp
10 years ago
ocornut
c6de9502f8
Avoid requesting IO.WantCaptureMouse if earlier click/hold was outside of ImGui window
10 years ago
ocornut
94c7eddb17
Comments
10 years ago
ocornut
5df28b101d
Added ImGuiWindowFlags_NoCollapse flag
10 years ago
Jim Tilander
e6318abcee
Merged changes from original master
10 years ago
ocornut
cc3d41dbab
Version number 1.31 wip
10 years ago
ocornut
bde3f6b90d
Removed the dependency on realloc functionality #117 + fixed one alloc in NewFrame()
10 years ago
ocornut
56bf9ea067
Added comment on MemFreeFn as suggested by #119
10 years ago
ocornut
e636e0d2aa
Warning fixes ( fix #118 )
10 years ago
Jim Tilander
3478e3a708
Enabled us to create the internal state on client side allocated memory, e.g. a heap
10 years ago
Jim Tilander
8149bace7b
Added a way to replace the internal state pointer so that we can optionally share it between modules (e.g. multiple DLLs)
10 years ago
Jim Tilander
98e71afa72
Removed the dependency on realloc functionality
10 years ago
ocornut
a548c9b0d5
Version change
10 years ago
ocornut
ca10c49e27
Embedded a mouse cursor that can be drawn for you by setting io.MouseDrawCursor
10 years ago
ocornut
68bad703ee
ImColor::HSV() helper + color buttons demo
10 years ago
ocornut
8d1583d611
Added ImColor() inline helper. Image/ImageButton() now takes ImVec4 for consistency and honor window alpha.
10 years ago
ocornut
cb3b69c879
Exposed ColorConvertHSVtoRGB, ColorConvertRGBtoHSV, ColorConvertFloat4ToU32
10 years ago
ocornut
3cf47988b0
Added ImageButton() using regular framing + override framing size ( #73 )
10 years ago
ocornut
2ecc285919
ImDrawList::AddCallback() allows for custom rendering (e.g. 3D scene inside a imgui widget))
10 years ago
ocornut
4437293b79
Added ImDrawList::SplitDrawCmd() to force multiple draw calls for depending rendering/blending + Comments
10 years ago
ocornut
27161d2a98
Added io.DisplayVisibleMin / io.DisplayVisibleMax to allow for virtual / scrolling display.
...
+ remove duplicated "Setup outer clipping rectangle" block in Begin))
10 years ago
ocornut
07f69966f8
ImDrawList::AddImage() color parameter defaults to white
10 years ago
ocornut
79042a3a3c
GetVoidPtr() functions like GetInt, GetFloat. Renamed GetIntPtr/GetFloatPtr to GetIntRef/GetFloatRef
10 years ago
Daniel Collin
c9c41c3874
Added Set/GetVoidPtr in ImGuiStorage
10 years ago
ocornut
7530f3c985
Added IsItemActive() - replace IsItemFocused()
...
ClipAdvance() --> ItemAdd() - nb: return value is inverted
10 years ago
ocornut
70188c5623
Added comments
10 years ago
ocornut
26174cba85
Added InvisibleButton()
10 years ago
ocornut
56ac857cac
Added stub for obsolete GetDefaultFontData() to help the user upgrading
10 years ago
ocornut
1916a0c78c
Renamed FontAtlas to Fonts. Further cleanup/comments.
10 years ago
ocornut
1f8d209202
Fixed more clang warnings + AddFontFromMemoryTTF() not honoring font_no parameter
10 years ago
ocornut
2c31599bcc
ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
10 years ago
ocornut
cb9a3235be
Removed PixelCenterOffset, uncesssary
10 years ago
ocornut
014f88b1fc
Font fixes for horizontal centering within frames
10 years ago
ocornut
3e30ad3802
PushFont/PopFont changes texture at high-level in current draw list - faster
10 years ago
ocornut
7ebd7ef9ac
Added PushFont/PopFont API
10 years ago
ocornut
ab8d2782c6
Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
...
Conflicts:
imgui.cpp
imgui.h
10 years ago
ocornut
584c7ffac8
Added SetCursorScreenPos() helper (WindowPos+CursorPos = SrceenPos)
10 years ago
ocornut
02f0dbca37
ColorEdit3: clicking on color square change edit-mode, removing color-edit mode button by default.
10 years ago
ocornut
8ba93d947c
Added FrameRounding setting (default to 0 for now).
10 years ago
ocornut
3a20671802
Fixed logging to clipboard on architectures where va_list are modified by vsnprintf ( fixed #112 )
10 years ago
ocornut
e2d8c03e1a
Fixed ImGuiTextBuffer::empty() to ignore the enforced zero-terminator
...
+ removed unnecessary destructor
10 years ago
ocornut
0f4d74d614
ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
...
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
10 years ago
ocornut
241e8086fa
Mde it optional to new() io.Font - however it stills needs to be loaded.
10 years ago
ocornut
cc79b85c28
Added first-pass of Image() based on #73 + demo
10 years ago
ocornut
1a6e7f25e0
ImVector: less hoops in back() / front(), more friendly for debugger and unoptimized builds
...
+ fixed typos
10 years ago
ocornut
f77490cb2d
Cleanup extra_fonts/ folder
10 years ago
ocornut
b3a208901a
Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
10 years ago
ocornut
b0ea57e518
Version number
10 years ago
Mikko Mononen
91684a428b
Merge upstream
10 years ago
Mikko Mononen
d9757bb583
First pass on AA rendered primitives
10 years ago
ocornut
0505995193
Very minor code/comments tweaks.
10 years ago
ocornut
22c1d7eded
Renamed some color enums
10 years ago
ocornut
39373b563b
Checkbox and Radio buttons activate on click-release to be consistent with other widgets and most UI
10 years ago
ocornut
12225abfe2
Version number (fix)
10 years ago
ocornut
f8c58fe328
Fix for Clang
10 years ago
ocornut
da5227fa28
Added comment about defining IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT in imconfig.h
10 years ago
ocornut
2d111ccb55
crc32 on strings is performed in one pass - removed the strlen() call.
10 years ago
ocornut
691ca46978
Version number
10 years ago
ocornut
929f127d06
Added SliderInt2(), SliderInt3(), SliderInt4() for consistency
10 years ago
ocornut
036a153cf4
Log depth padding relative to start depth. Tree node and headers looking better when logged to text. Added LogText().
10 years ago
ocornut
886d954e3d
GetStyleColorName -> GetStyleColName for consistency with type name. Removed ImGuiStyleVar_ColumnsMinSpacing
10 years ago
ocornut
39952d2362
Renamed GetTreeStateStorage() to GetStateStorage(). Columns storing floats instead of fixed point integers
10 years ago
ocornut
1b25fa8169
Added LogFinish() to stop logging at an arbitrary point.
10 years ago
ocornut
e2fbbe0274
Factoring bits out of Begin() into a private CreateNewWindow() funciton
...
(Hopefully to ease a bit the merging work for ProDBG)
10 years ago
ocornut
5b7ed5432e
CalcTextSize() default third parameter to false because it almost never makes sense to use it from the outside (may obsolete it)
10 years ago
ocornut
90351298d1
Renamed second parameter to Begin() to 'bool* p_opened' to be more self-explanatory. Added more comments on the use of Begin().
10 years ago
ocornut
a3af51fd4e
Added ImGuiStyleVar_WindowRounding enum for PushStyleVar() API
10 years ago
omar
7e868e2842
Cleanup todo list, removed 3 done items + added 1 new
10 years ago
omar
0056ccce26
Version number
10 years ago
omar
e9e0e36f98
New and better Set[Next]Window(Pos|Size|Collapsed) API.
...
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
10 years ago
omar
3399890a84
Added ImGuiWindowFlags_NoSavedSettings flag + Fixed overlay example app.
10 years ago
omar
2a3bff9a82
Comments
10 years ago
omar
cca5f473ca
Clarified comment
10 years ago
omar
bdb2344db0
ImGuiStorage helper can store float + added functions to get pointer to data. Exposed ImGui::GetId() - may be misleading?
10 years ago
ocornut
e43cd6e97f
Added IMGUI_INCLUDE_IMGUI_USER_H
10 years ago
omar
6b16424faf
Comments.
10 years ago
omar
860cf578f5
Added ImGuiWindowFlags_NoScrollWithMouse flag.
...
ButtonBehaviour test hovering of CurrentRootWindow (vs CurrentWindow, different for child-windows). This is intentionally meant to fix grabbing the lower-right resize grip when lower-right corner has a child-window, but may be the overall right-er test. Testing out.
10 years ago
omar
d31623061f
ImVector: private -> protected
10 years ago
ocornut
7f804d3d64
Tab->Spaces :( visual studio can't even be trusted for that, oh thanks.
10 years ago
ocornut
e835ef1d90
Fix from incorrect change left-over in a31e44b99a
10 years ago
ocornut
214c967df8
Example code: warning fix + comments.
10 years ago
omar
31654958f9
Merge pull request #92 from memononen/master
...
Smoother mouse wheel scrolling
10 years ago
ocornut
a31e44b99a
Fixed Clang -Weverything warnings + TODO list entries
10 years ago
Mikko Mononen
eb789c0288
Smoother scrolling
...
- changed IO.MouseWheel to float, allows smoother scrolling
10 years ago
ocornut
e9aead09cb
Remove unneeded extra parameter from ImFont::FindGlyph()
10 years ago
ocornut
e4a79e9fc8
Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale)
10 years ago
ocornut
e27eddfbd2
Grammar fix + ocd alignment
10 years ago
ocornut
311a2f8328
New version of IMGUI_ONCE_UPON_A_FRAME helper macro
10 years ago
ocornut
df2ad5e899
Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef
10 years ago
omar
b9118750ae
Removed IMGUI_ONCE_UPON_A_FRAME in favor of ImGuiOnceUponAFrame which is supported by all compilers
10 years ago
ocornut
49defcf083
InputText support for completion/history/custom callback + added fancy completion example in the console demo app
...
Unfortunately quite messy because of the UTF-8 <> wchar confusion going
around. Not well tested for UTF-8 compliance with non-Ascii characters.
10 years ago
omar
8c4fcf1359
Added ImGuiWindowFlags_AlwaysAutoResize + example app. Calling SetWindowSize(0,0) force an autofit without zero-sizing first.
10 years ago
omar
5f8175abaa
Version number
10 years ago
omar
cf037b4769
PushStyleColor/PushStyleVar can be used outside the scope of a window. Added 'count' parameter to PopStyleColor/PopStyleVar
10 years ago
ocornut
97192606a6
Fixed Tab > space
10 years ago
ocornut
2aee4419e3
Fixed compatibility with std::vector if user decide to #define ImVector
10 years ago
ocornut
f3bd033b6d
More fixes for ultra pedantic Clang -Weverything
10 years ago
Daniel Collin
b01adf16de
Fixed more Clang warnings
10 years ago
omar
c6f3d0924e
Default 'text_end' parameter for low-level AddText/CalcTextSizeA functions
10 years ago
ocornut
191e17eaf8
Added IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT
10 years ago
omar
4205241e86
PushTextWrapPos() defaults to 0.0
10 years ago
omar
ee3355fe8e
Version number
10 years ago
omar
1e30400f80
Added PushStyleVar(),PopStyleVar() helpers.
...
BeginChild() allows to specify negative sizes to specify "use remaining minus xx".
Added a simple example console into the demo window.
10 years ago
omar
3a64c77826
Renamed IsHovered() to IsItemHovered()
10 years ago
omar
e19f0d370a
Added dummy IMGUI_API definition in front of entry-points for silly DLL action
10 years ago
omar
6c192f3221
Added GetContentRegionMax() supporting columns. Some bug fixes with using columns.
10 years ago
omar
78645a7dba
Added word-wrapping API TextWrapped(), PushTextWrapPos(), PopTextWrapPos()
...
Added word-wrapping sample in the test window.
Added IsItemFocused() to tell if last widget is being focused for keyboard input.
10 years ago
ocornut
3d84858755
Made with the NoResize flag can still use auto-fitting. Added SetWindowSize().
10 years ago
ocornut
fad5e45d2c
Minor tweaks
10 years ago
Jarrett Billingsley
85eee4a4c5
Added overloads of ImGui::PlotLines and ImGui::PlotHistogram which take a value getter function instead of raw value data, and changed the implementation of the original overloads to use this new implementation.
10 years ago
ocornut
e6eafd6fa8
Fixed warnings for GCC -Wpedantic
10 years ago
omar
1037bacc4b
Version number
10 years ago
omar
89a412690c
Added comment on return value of Begin()
10 years ago
omar
af37fb1ee7
Added GetWindowFont(), GetWindowFontSize() + comments following user's feedback
10 years ago
ocornut
9f05a2bb16
Fixed unlikely buffer overrun in InputCharacters (thanks Daniel Collin)
10 years ago
ocornut
48a944813c
Moved UserData
10 years ago
ocornut
1d9a4748de
Added a UserData void *pointer so that the callback functions can access user state
...
"Just in case a project has adverse reactions to adding globals or
statics in their own code."
10 years ago