1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-09-24 19:48:34 +02:00
Commit Graph

501 Commits

Author SHA1 Message Date
ocornut
815d1d9be4 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-08-03 08:12:57 -06:00
ocornut
3aca446817 Added ImFontAtlas::AddFontFromMemoryCompressedBase85TTF() 2015-08-03 08:10:10 -06:00
ocornut
e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-01 22:12:51 -06:00
ocornut
1e76c63bb6 Fixed comment 2015-08-01 08:07:16 -06:00
ocornut
dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 2015-07-21 17:00:28 -06:00
ocornut
5a4b521855 Added ImDrawList::AddText() shorthand helper 2015-07-18 21:50:23 -06:00
ocornut
74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason 2015-07-18 18:45:37 -06:00
ocornut
82727d7119 Version number 1.44 WIP 2015-07-18 14:07:22 -06:00
ocornut
cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window
Would be more useful with finer control over display layer
2015-07-17 16:36:04 -06:00
ocornut
20db726a9a Version number 1.44 WIP 2015-07-17 16:03:13 -06:00
ocornut
e8cb874afe Version number 1.43 2015-07-17 06:51:25 -06:00
ocornut
d6117e33d0 AddInputCharactersUTF8: shallow tweaks (#274) 2015-07-15 22:14:04 -06:00
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.
2015-07-16 05:15:03 +02:00
ocornut
5e846612d3 ImFont: tweaks 2015-07-15 14:54:56 -06:00
ocornut
3e3d9f9a69 ImFontAtlas: allow AddFontDefault to take a config 2015-07-15 07:58:33 -06:00
ocornut
815168c7ef ImFontAtlas: new AddFont() API, oversampling, subpositiong, merging fonts, etc. (#182, #220, #232, #242) 2015-07-15 07:01:21 -06:00
ocornut
6ae8062ca0 ImFont: comments, minor bits 2015-07-14 15:51:19 -06:00
ocornut
c02f9b58ef ImFont: Cleanup to be compatible with over-sampling (not enabled) 2015-07-14 12:41:02 -06:00
ocornut
ba9317b924 ImFont: storing offsets as X0/Y0/X1/Y1 analoguous to examples for stb_truetype 2015-07-13 16:08:49 -06:00
ocornut
fbb9113118 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-07-12 11:02:46 -06:00
ocornut
6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. 2015-07-12 10:48:06 -06:00
ocornut
fd44b9440b Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-07-10 21:45:25 -06:00
ocornut
b67593a4b1 Changed SameLine() parameters from int to float. 2015-07-10 19:36:34 -06:00
ocornut
827ff970cd InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag 2015-07-10 18:47:55 -06:00
ocornut
d2701727b9 InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification. 2015-07-10 18:17:46 -06:00
ocornut
245cf36522 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 17:09:47 -06:00
ocornut
890585cde8 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 17:08:51 -06:00
ocornut
08b1dd1035 Version number 1.43 WIP
Bits
2015-07-08 17:08:37 -06:00
ocornut
09e8c4ec11 AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133) 2015-07-08 14:03:27 -06:00
ocornut
e5bea65582 Version number 1.42 2015-07-08 12:59:26 -06:00
ocornut
54c2665032 AA branch: undo d35c1a9e66, thickness is back but goes through non-AA path (#133) 2015-07-07 20:56:58 -06:00
ocornut
d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133) 2015-07-07 20:17:07 -06:00
ocornut
d35c1a9e66 AA branch: removed the 'thickness' parameter from ImDrawList::AddLine() 2015-07-07 18:34:29 -06:00
ocornut
87ebe95fd6 Columns/ImDrawList: dispatch render of each column in a sub-draw list and merge on closure, saving draw calls (#125) 2015-07-07 18:19:01 -06:00
ocornut
3e4841765d ImDrawList: winodw draw lists destructed properly on Shutdown() 2015-07-07 18:00:19 -06:00
ocornut
bfa7d86070 AA branch: further use of ImVector<> Data/Size 2015-07-07 12:58:36 -06:00
ocornut
c3ced1bd71 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-07-07 12:42:29 -06:00
ocornut
3869e10574 ImVector<> access to Size/Capacity/Data (#262) 2015-07-07 12:39:08 -06:00
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
2015-07-07 12:15:35 -06:00
ocornut
502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
2015-07-07 12:09:25 -06:00
ocornut
02dbcf5405 ImVector<> cannot be re-defined (#262) 2015-07-07 11:27:22 -06:00
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.
2015-07-06 21:09:05 -06:00
ocornut
0ff2a6ff64 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	imgui.cpp
2015-07-06 10:56:50 -06:00
ocornut
d6987d1586 ImDrawList store pointer to their owner name for easier auditing/debugging. Metrics windows render clip rectangle when hovering. 2015-07-06 10:52:49 -06:00
ocornut
c52cefa2c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-05 22:27:50 -06:00
ocornut
0676efd37f AA branch: added ImDrawData::DeIndexAllBuffers() helper (#254) 2015-07-05 22:09:55 -06:00
ocornut
b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count 2015-07-05 22:09:15 -06:00
ocornut
f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254) 2015-07-05 22:03:46 -06:00
ocornut
2633325b9f Comments 2015-07-05 21:55:24 -06:00
ocornut
562aecdaa5 Removed obsolete GetDefaultFontData() function that would assert anyway (obsoleted 2015/01/11) 2015-07-05 20:56:01 -06:00