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