ocornut
|
fbb9113118
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
10 years ago |
|
ocornut
|
6520b6c458
|
ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation.
|
10 years ago |
|
ocornut
|
fd44b9440b
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
10 years ago |
|
ocornut
|
b67593a4b1
|
Changed SameLine() parameters from int to float.
|
10 years ago |
|
ocornut
|
827ff970cd
|
InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag
|
10 years ago |
|
ocornut
|
d2701727b9
|
InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.
|
10 years ago |
|
ocornut
|
245cf36522
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
10 years ago |
|
ocornut
|
890585cde8
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
10 years ago |
|
ocornut
|
08b1dd1035
|
Version number 1.43 WIP
Bits
|
10 years ago |
|
ocornut
|
09e8c4ec11
|
AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133)
|
10 years ago |
|
ocornut
|
e5bea65582
|
Version number 1.42
|
10 years ago |
|
ocornut
|
54c2665032
|
AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path (#133)
|
10 years ago |
|
ocornut
|
d03b046ef4
|
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133)
|
10 years ago |
|
ocornut
|
d35c1a9e66
|
AA branch: removed the 'thickness' parameter from ImDrawList::AddLine()
|
10 years ago |
|
ocornut
|
87ebe95fd6
|
Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls (#125)
|
10 years ago |
|
ocornut
|
3e4841765d
|
ImDrawList: winodw draw lists destructed properly on Shutdown()
|
10 years ago |
|
ocornut
|
bfa7d86070
|
AA branch: further use of ImVector<> Data/Size
|
10 years ago |
|
ocornut
|
c3ced1bd71
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
imgui.cpp
|
10 years ago |
|
ocornut
|
3869e10574
|
ImVector<> access to Size/Capacity/Data (#262)
|
10 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
|
10 years ago |
|
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 |