Commit Graph

1581 Commits

Author SHA1 Message Date
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
omar fc9ee2bc9b Merge pull request #286 from GHF/cleanup
Remove non-text character at start of imgui.cpp
2015-07-30 12:14:01 -06:00
Xo Wang 8d45c89352 Remove non-text character at start of imgui.cpp 2015-07-26 19:18:04 -07: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
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ocornut/imgui#277). 2015-07-19 17:56:14 +02: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
omar 98047b1b65 Update README.txt 2015-07-16 14:28:16 -06:00
omar f53d5da0f8 Update README.txt 2015-07-16 14:27:35 -06:00
ocornut d6117e33d0 AddInputCharactersUTF8: shallow tweaks (#274) 2015-07-15 22:14:04 -06:00
omar bc4ede656b Merge pull request #274 from DanielGibson/utf8-char-input
ImGuiIO::AddInputCharactersUTF8(utf8str), use it in SDL2 example
2015-07-15 22:08:59 -06:00
Daniel Gibson b7d1b91e4b Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
Now Unicode text input works in this example.
2015-07-16 05:16:22 +02: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
omar b4ac413868 Merge pull request #273 from DanielGibson/fix-sdl2-linux
Examples: Fix SDL2 example for Linux.
2015-07-15 20:15:33 -06:00
Daniel Gibson 02a0967243 Fix SDL2-example for Linux
The header is called "SDL_opengl.h" - case matters on Linux.

The main() function must indeed be called main(), on Windows it'll be
renamed to SDL_main (for SDL2main.lib) by #define in SDL_main.h
(which is included by SDL.h)

I added an entry to the example's README that describes how to build
it on Linux.
2015-07-16 03:54:44 +02:00
ocornut 3ff04c95d5 Minor tweaks 2015-07-15 17:18:46 -06:00
omar 52dd99915b Update README.md 2015-07-15 17:05:14 -06:00
ocornut 0f25885b3d Merge branch 'master' of https://github.com/ocornut/imgui 2015-07-15 17:02:38 -06:00
omar 9d4d7f3381 Update README.md 2015-07-15 17:00:47 -06:00
omar 298118fccc New screenshots 2015-07-15 16:58:38 -06:00