moonpower/imgui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,528 Commits 4 Branches 0 Tags
5e846612d30ece24dbbee6086bec02a870cebaea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut 5e846612d3 ImFont: tweaks 2015-07-15 14:54:56 -06:00
ocornut 80276ef07b Fixed ClearInputData() 2015-07-15 14:48:46 -06:00
ocornut 6c3ab6fc9b ImFont: fixed minor bug with CPU-side vertical clipping of text. 2015-07-15 13:34:59 -06:00
ocornut a56768463a Examples: moved demo bits around. 2015-07-15 13:16:35 -06:00
ocornut d750df9189 Fix for Shutdown() 2015-07-15 12:37:42 -06:00
ocornut baa2328b99 Tweak to RenderCheckMark() 2015-07-15 12:31:37 -06:00
ocornut d7a2a23457 Updated to stb_truetype 1.06 (#133) 2015-07-15 12:12:36 -06:00
ocornut 8081e81e55 Fixed warnings + label 2015-07-15 11:56:07 -06:00
ocornut 1a3ef63132 Fixed parameters array size declaration (wouldn't have a side-effect but weird and misleading) 
Thanks Coverity
 2015-07-15 09:36:39 -06:00
ocornut 368d2c3568 OverlayDrawList readier for pushing elements (not exposed yet) 2015-07-15 09:26:03 -06:00
ocornut 0224d29a35 Examples: comments. 2015-07-15 09:05:17 -06:00
ocornut 035ff302d2 ImFontAtlas: moved application of FontDataOwnedByAtlas to AddFont() 2015-07-15 08:45:10 -06:00
ocornut 95f489ac1f Merged AA branch in master! (#133) 2015-07-15 08:00:12 -06:00
ocornut 3e3d9f9a69 ImFontAtlas: allow AddFontDefault to take a config 2015-07-15 07:58:33 -06:00
ocornut 7ad4843f57 Fixed comments 2015-07-15 07:52:20 -06:00
ocornut 99a92ee7c5 Comments (fixed old comments) 2015-07-15 07:46:31 -06:00
ocornut 8952b93b2f Include for alloca() 2015-07-15 07:31:32 -06:00
ocornut fcec337061 Examples: Simplified font examples comments. 2015-07-15 07:05:34 -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 fc6545830b Examples: displaying more font information. 2015-07-14 10:28:55 -06:00
ocornut faec745438 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-14 09:23:50 -06:00
ocornut 8cfd963fda Popups: removed an apparently unnecessary test in CloseInactivePopups() that broke Combo boxes inside menus (#272) 2015-07-14 09:21:41 -06:00
ocornut 355cbf6326 Examples: added tests for Combo box in sub-menu test and MenuItem in a normal window (#272) 2015-07-14 09:10:31 -06:00
ocornut 52c820e7b0 Metrics: more details in popup stack (#272) 2015-07-14 09:09:52 -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 5b053dd350 Fix for OverlayDrawList being ready to append commands (not exposed publicly yet anyway) 2015-07-13 15:52:57 -06:00
ocornut 7eca4e2a7f Merge bits 2015-07-12 11:05:30 -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 4565bf9813 Demo: custom rendering example uses AddRectFilledMultiColor() 2015-07-12 10:52:20 -06:00
ocornut 6520b6c458 ImDrawList: added AddRectFilledMultiColor() helper + minor optimisation. 2015-07-12 10:48:06 -06:00
ocornut 7a0004eb86 Revert 2015-07-11 18:15:34 -06:00
ocornut d10d0343b2 Plot() function can take 0.0f for both scale_min/scale_max to calculate scale 2015-07-11 18:10:43 -06:00
ocornut e681937f66 Delete merging artefact that survived for a day 2015-07-11 08:41:11 -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 8094aa78d2 Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere() 2015-07-10 18:54:26 -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 f2bed00d80 Examples: README 2015-07-09 08:39:44 -06:00
ocornut 5ab23ab1c0 Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval 2015-07-08 17:25:56 -06:00
ocornut 398ef1a212 Comments 2015-07-08 17:10:14 -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 fec09e37ab Disable warnings, undo f4aae6b9ec (#265 #266) 2015-07-08 17:05:24 -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 2f574ef952 Allegro 5 example: converted for indexed rendering. 2015-07-08 12:55:40 -06:00
ocornut 60dd221737 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 12:49:18 -06:00
ocornut bbaaab7537 Allegro 5 example: fixed uv coordinate of non-default texture. 2015-07-08 12:41:09 -06:00
ocornut 4d2d0ce5cd Allegro 5 example: handling of hardware and software mouse cursor rendering. 2015-07-08 12:16:50 -06:00
ocornut 8db229b96f Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup. 2015-07-08 12:04:13 -06:00
ocornut c58d61dfd1 Allegro 5 example: formatting, match other example structure, fixed mouse buttons. 2015-07-08 11:53:30 -06:00
ocornut 489e28ec11 Allegro 5 example: main.cpp matches other examples. added window title. 2015-07-08 11:46:18 -06:00
ocornut 1845ff4690 SDL example: tweaks (#233 #226) 2015-07-08 11:42:43 -06:00
ocornut 19e3c1506f Allegro5 example: added example from https://github.com/bggd/a5imgui_example 2015-07-08 11:34:36 -06:00
ocornut e49977a913 SDL example: hasty readme. 2015-07-08 11:08:58 -06:00
ocornut d041ebc6d4 Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives 2015-07-08 10:33:25 -06:00
ocornut b7e63c163c SDL example: update for indexed rendering. 2015-07-08 10:32:55 -06:00
ocornut b36ff2fec3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-08 10:30:30 -06:00
ocornut a14f6696a3 SDL example: more cleanup to match other examples (#233 #226) 2015-07-08 10:27:25 -06:00
ocornut 22e099366f SDL example: further cleanup to match other examples (#233 #226) 2015-07-08 10:20:08 -06:00
ocornut 4167528001 SDL example: moved event loop to main.cpp , adding page up/page down. (#226) 2015-07-08 10:10:54 -06:00
ocornut b7a2a6b23f SDL example: renamed folder, added in README 2015-07-08 09:49:32 -06:00
ocornut 44c23e0eed Allowing DeltaTime==0.0f to not assert 2015-07-08 09:48:10 -06:00
ocornut b3ae2976c5 SDL example: tweaks and fixes. 2015-07-08 09:46:55 -06:00
ocornut 046dbf502c Merge branch 'SampleSDL2' of https://github.com/CedricGuillemet/imgui into CedricGuillemet-SampleSDL2 2015-07-08 09:01:04 -06:00
ocornut e3b9a61883 Examples: OpenGL3: simplified code. Upload each vertex array separately. (cf #264) 2015-07-08 08:27:36 -06:00
ocornut 1cd391146d Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-07 21:48:28 -06:00
ocornut 67d93156df Fixed clang/gcc warnings (#133) 2015-07-07 21:47:33 -06:00
ocornut 5f039e7098 Merge branch 'ios_example_merge' 2015-07-07 21:39:05 -06:00
ocornut 7d144eb899 iOS Example: Optimise PNG files size 2015-07-07 21:37:50 -06:00
ocornut fb27360ea8 iOS example: shallow tweaks and fixes (untested) 2015-07-07 21:35:09 -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 439040bb25 AA branch: more comments on breaking changes (#133) 2015-07-07 20:30:46 -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 ac56e4e209 AA branch: API breaking change documentation 2015-07-07 18:31:41 -06:00
ocornut af7f35d7c2 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-07 18:22:18 -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 f4fc008a2a Fixed ListBoxHeader() not honoring negative sizes the same way as BeginChild() or BeginChildFrame() (#263) 2015-07-07 16:53:09 -06:00
ocornut acf58c6223 More debug-build friendly ImVector<> use micro optimisations for the most bottle-neck bunchs 2015-07-07 13:54:06 -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 aeae03f4ac Fixed minor zealous Clang warning (demo code intentionally uses strdup() to be copiable) 2015-07-07 12:05:15 -06:00
ocornut 02dbcf5405 ImVector<> cannot be re-defined (#262) 2015-07-07 11:27:22 -06:00
ocornut 4d42760c0b Metrics window: "Show clipping rectangles when hovering ImDrawList" enabled by default 2015-07-06 22:10:44 -06:00
ocornut de6dfe8c5d ImRect (internal) fixed ImVec4 constructor, argh (broken e7e2fcdd19) 2015-07-06 22:05:27 -06:00
ocornut 92b61d2ee4 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 2015-07-06 21:47:09 -06:00
ocornut b92396b46a Optimisation, removed the duplicate ClipRectStack in ImGuiWindow, storing single value 2015-07-06 21:46:12 -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 e7e2fcdd19 ImRect (internal) made constructors more non-optimised compilation friendly 2015-07-06 20:59:01 -06:00
ocornut a17e47fe14 ImDrawList: fixed non-merged commands when equal clip rectangles are in the two first commands 2015-07-06 20:38:06 -06:00
ocornut 5782c69c2a Metrics window: calculate bounding box of actual vertices when hovering a draw list. 2015-07-06 16:34:41 -06:00