Commit Graph
100 Commits
Author SHA1 Message Date
ocornut 1befd21b37 Moved ShowUserGuide() after ShowTestWindow() (#219) 2015-08-05 09:31:03 -06:00
ocornut 3658314638 imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built (#219) 2015-08-05 09:28:19 -06:00
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 da3baebd43 Fixed lower-right resize grip hit box not scaling along with its rendered size (#287) 2015-08-02 09:15:36 -06:00
ocornut e099798c97 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-08-01 22:12:51 -06:00
ocornut 3ccbdc8423 Unnecessary .gitignore in root folder 2015-08-01 22:12:18 -06:00
ocornut 4b29cc9e10 Exposed relevant functions in imgui_internal.h (#219) 2015-08-01 21:57:24 -06:00
ocornut e47bf041bf Clang warning fixes 2015-08-01 21:37:32 -06:00
ocornut 11d91a27a4 Carriage return (#289) 2015-08-01 17:18:01 -06:00
ocornut 1e76c63bb6 Fixed comment 2015-08-01 08:07:16 -06:00
ocornut 2d8c134747 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-08-01 07:26:09 -06:00
ocornut 26a992c6f6 Updated to stb_truetype 1.07 (back to vanilla version as our minor changes are now in master & fix #280) 2015-08-01 07:22:52 -06:00
ocornut 6c63d80aa4 Tidying up InputTextApplyArithmeticOp() 2015-07-30 23:59:51 -06:00
ocornut f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up 2015-07-30 23:48:59 -06:00
ocornut faa609a43c Internal cleanup ParseFormatPrecision() doesn't take a reference 2015-07-30 23:14:29 -06:00
ocornut f8646338c3 Merge remote-tracking branch 'origin' into 2015-07-cleanup 2015-07-30 23:00:11 -06:00
ocornut 7650d4cc67 Internal SliderFloatAsInputText() -> InputFloatReplaceWidget() 2015-07-30 22:59:30 -06:00
ocornut abf823c6f6 Tidying up 2015-07-30 22:49:10 -06:00
ocornut 58ee08f214 Todo list notes 2015-07-30 22:18:07 -06:00
ocornut 040f3950a3 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-07-30 21:54:07 -06:00
ocornut e6b29b70b4 Make internal SliderFloatAsInputText() take a size to match the calling widget 2015-07-30 21:51:55 -06:00
ocornut a7e5945206 Merge 2015-07-30 21:37:59 -06:00
ocornut c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-07-30 21:37:47 -06:00
ocornut 02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (#133, also ref #288) 2015-07-30 21:11:07 -06:00
ocornut a79ee94fc4 Removed unnecessary assignment + added comment 2015-07-30 20:59:41 -06:00
ocornut 709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
2015-07-30 20:42:12 -06:00
ocornut 527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex) 2015-07-30 19:36:55 -06:00
ocornut fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set. 2015-07-30 12:32:20 -06:00
ocornut 4468ec001e Fixed warning in console example (we're iterating chars) 2015-07-22 06:38:19 -06:00
ocornut fb83323b1d Tidying up 2015-07-21 20:13:12 -06:00
ocornut 62c888177a Tweaks 2015-07-21 20:06:34 -06:00
ocornut e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described (#219) 2015-07-21 19:57:32 -06:00
ocornut 68962ae683 README update 2015-07-21 19:53:06 -06:00
ocornut 7552f48d7b ImLoadFileToMemory() default parameters 2015-07-21 17:46:49 -06:00
ocornut 94f085aa3e Update comments (#219) 2015-07-21 17:19:11 -06:00
ocornut 5a29eef1fa Fixed further warnings with GCC/Clang (#219) 2015-07-21 17:13:56 -06:00
ocornut e32f0931e8 Missing includes for imgui_draw.cpp (#219) 2015-07-21 17:08:20 -06:00
ocornut 52a74701f5 Updated projects to reference new files (#219)
Didn't update iOS example (#247)
2015-07-21 17:04:03 -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 60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. (#219) 2015-07-19 11:45:03 -06:00
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (#277, #278) 2015-07-19 10:52:51 -06:00
ocornut dc1cb9e625 Tweak 2015-07-19 10:49:56 -06:00
ocornut d184730dd2 Merge branch 'trevex-master' 2015-07-19 10:45:59 -06:00
ocornut 83ebbebadd Fixed inconsistent declaration of ImVec2 privates operators 2015-07-18 22:37:08 -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 479211808f ImDrawList::AddPolyLine() tidying up in AA path 2015-07-18 17:31:40 -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 0ab620c2b9 Combo() clamp popup to lower edge of visible area 2015-07-17 16:14:04 -06:00
ocornut 20db726a9a Version number 1.44 WIP 2015-07-17 16:03:13 -06:00
ocornut 4015414978 InputtextMultiline(): honor negative size consistently with other widgets 2015-07-17 16:01:21 -06:00
ocornut 3b53a6513a Button() honor negative size consistently with other widgets that do so 2015-07-17 15:58:23 -06:00
ocornut eca26ae91d Build fix for MinGW (#276) 2015-07-17 13:38:55 -06:00
ocornut 99c5f5735c Tweak button sizes 2015-07-17 07:08:51 -06:00
ocornut e8cb874afe Version number 1.43 2015-07-17 06:51:25 -06:00
ocornut 55ab515551 Binaries 2015-07-16 21:02:43 -06:00
ocornut 1266e4a181 Added a gratuitous About window 2015-07-16 20:58:26 -06:00
ocornut f7f71043ca InputText: stb_textedit.h tentative fix for End key on multi-line fields (#275) 2015-07-16 20:46:27 -06:00
ocornut d6117e33d0 AddInputCharactersUTF8: shallow tweaks (#274) 2015-07-15 22:14:04 -06:00
ocornut 3ff04c95d5 Minor tweaks 2015-07-15 17:18:46 -06:00
ocornut 0f25885b3d Merge branch 'master' of https://github.com/ocornut/imgui 2015-07-15 17:02:38 -06:00
ocornut d19d8f40ba Removed web screenshots (moved to wiki repository) 2015-07-15 16:27:33 -06:00
ocornut d170620816 Comments 2015-07-15 14:59:42 -06:00
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf 2015-07-15 14:56:29 -06:00
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