Commit Graph

4434 Commits (cd455a4600b351fb7da053c024101315a96638f2)
 

Author SHA1 Message Date
ocornut c639f65eb7 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 02fbb36918 ImDrawList: Add missing support for anti-aliased thick-lines (, also ref )
ocornut a79ee94fc4 Removed unnecessary assignment + added comment
ocornut 709c4c3168 Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
	imgui.cpp
ocornut 527208ad7c Default font encoded as base85 saves ~100 lines / 26 KB of source code (from @mmalex)
ocornut fddc871870 Columns: never assume horizontal space for scrollbar if NoScrollbar flag is set.
omar fc9ee2bc9b Merge pull request from GHF/cleanup
Remove non-text character at start of imgui.cpp
Xo Wang 8d45c89352 Remove non-text character at start of imgui.cpp
ocornut 4468ec001e Fixed warning in console example (we're iterating chars)
ocornut fb83323b1d Tidying up
ocornut 62c888177a Tweaks
ocornut e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described ()
ocornut 68962ae683 README update
ocornut 7552f48d7b ImLoadFileToMemory() default parameters
ocornut 94f085aa3e Update comments ()
ocornut 5a29eef1fa Fixed further warnings with GCC/Clang ()
ocornut e32f0931e8 Missing includes for imgui_draw.cpp ()
ocornut 52a74701f5 Updated projects to reference new files ()
Didn't update iOS example ()
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ()
ocornut 60dce8bc22 Fix to get all code ShowTestWindow() copiable outside. Moved ShowMetricsWindows() above. ()
ocornut 0eb196d544 Examples: OpenGL3: simplified code using glBufferData for vertices as well (, )
ocornut dc1cb9e625 Tweak
ocornut d184730dd2 Merge branch 'trevex-master'
Nik Voss bc9bae6d01 To support drivers with strict core profiles, a buffer is used for the indices as well (fixes ).
ocornut 83ebbebadd Fixed inconsistent declaration of ImVec2 privates operators
ocornut 5a4b521855 Added ImDrawList::AddText() shorthand helper
ocornut 74908a9513 Fixed angles in ImDrawList::PathArcTo(), PathArcToFast() being off by an extra PI for no reason
ocornut 479211808f ImDrawList::AddPolyLine() tidying up in AA path
ocornut 82727d7119 Version number 1.44 WIP
ocornut cdbf71ac12 Added ImGuiWindowFlags_NoInputs for input-passthru window
Would be more useful with finer control over display layer
ocornut 0ab620c2b9 Combo() clamp popup to lower edge of visible area
ocornut 20db726a9a Version number 1.44 WIP
ocornut 4015414978 InputtextMultiline(): honor negative size consistently with other widgets
ocornut 3b53a6513a Button() honor negative size consistently with other widgets that do so
ocornut eca26ae91d Build fix for MinGW ()
ocornut 99c5f5735c Tweak button sizes
ocornut e8cb874afe Version number 1.43
ocornut 55ab515551 Binaries
ocornut 1266e4a181 Added a gratuitous About window
ocornut f7f71043ca InputText: stb_textedit.h tentative fix for End key on multi-line fields ()
omar 98047b1b65 Update README.txt
omar f53d5da0f8 Update README.txt
ocornut d6117e33d0 AddInputCharactersUTF8: shallow tweaks ()
omar bc4ede656b Merge pull request from DanielGibson/utf8-char-input
ImGuiIO::AddInputCharactersUTF8(utf8str), use it in SDL2 example
Daniel Gibson b7d1b91e4b Use ImGuiIO::AddInputCharactersUTF8() in SDL2 example
Now Unicode text input works in this example.
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.
omar b4ac413868 Merge pull request from DanielGibson/fix-sdl2-linux
Examples: Fix SDL2 example for Linux.
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.
ocornut 3ff04c95d5 Minor tweaks
omar 52dd99915b Update README.md