105 Commits

Author SHA1 Message Date
Cameron Hart
4bfd697e9b Merge branch 'master' into input 2016-01-23 14:04:16 +11:00
Joonas Javanainen
9750aa7989 Implement missing v1.47 changes 2016-01-18 21:32:31 +02:00
Joonas Javanainen
2033356f9c Fix mistakes in README file(s) 2016-01-18 21:02:57 +02:00
Joonas Javanainen
aa23b36556 Merge pull request #16 from not-fl3/master
update cimgui to 1.47
2016-01-18 20:57:19 +02:00
Cameron Hart
9e78e86000 Add support for popups and selectable widgets. 2016-01-17 20:05:30 +11:00
fl3
aae56e7bdc update cimgui to 1.47 2016-01-17 03:00:00 +03:00
Cameron Hart
05cb9ccc3f Add this back.
Still don't seem to need the import std::convert::From, maybe it's implicit.
2016-01-17 08:37:02 +11:00
Cameron Hart
2d9f63a1b8 Added support for combo widget 2016-01-17 00:51:46 +11:00
Cameron Hart
4739953a94 Removed unused convert::From 2016-01-17 00:50:56 +11:00
Cameron Hart
9bcb3cb0d5 Added color editing widgets 2016-01-15 08:23:33 +11:00
Cameron Hart
9a288b63f0 Added int array inputs
Also added aliases for input_f32 and input_i32. I don't think this
naming works so well with the arrays.
2016-01-15 07:49:00 +11:00
Cameron Hart
3c1e1e129a Added float array inputs 2016-01-15 00:17:43 +11:00
Cameron Hart
8e2c5640e4 Forgot to expose decimal_precision. 2016-01-14 23:08:12 +11:00
Cameron Hart
c4fdf854ca Added input_float, some change in macros and formatting 2016-01-14 22:55:12 +11:00
Cameron Hart
1c13208c22 Added input for single int. 2016-01-14 00:18:23 +11:00
Joonas Javanainen
d4318a41a2 Bump versions to 0.0.7-pre 2016-01-12 18:26:11 +02:00
Joonas Javanainen
c1febfe549 Release: 0.0.6 2016-01-12 18:24:51 +02:00
Joonas Javanainen
8e76f93bad Merge pull request #14 from cmr/master
Relicense to dual MIT/Apache-2.0
2016-01-12 18:18:15 +02:00
Corey Richardson
bfa8d89598 Relicense to dual MIT/Apache-2.0
Closes https://github.com/Gekkio/imgui-rs/issues/13
2016-01-12 11:02:02 -05:00
Joonas Javanainen
a8084c08b4 MORE BADGE(r)S 2016-01-04 19:10:55 +02:00
Joonas Javanainen
1d1caf9d24 Recursive submodules on Travis 2016-01-04 18:52:09 +02:00
Joonas Javanainen
9acbb5992c Travis configuration 2016-01-04 18:47:40 +02:00
Joonas Javanainen
af797b2528 Merge pull request #12 from bitshifter/glium-0.13
Upgrade glium to 0.13
2016-01-04 18:41:36 +02:00
Cameron Hart
6d2980f3cf Upgrade glium to 0.13 2016-01-01 11:12:22 +11:00
Joonas Javanainen
53780568d0 Remove legacy ImDrawData state passing
Since 1.45 the current ImDrawData is available using igGetDrawData() so
no callback is needed at all.
2015-12-23 14:56:09 +00:00
Joonas Javanainen
03e24243f2 Upgrade to imgui/cimgui 1.46 2015-12-23 14:51:55 +00:00
Joonas Javanainen
a854953236 Upgrade to imgui/cimgui 1.45 2015-12-23 14:35:45 +00:00
Joonas Javanainen
9a53bfe019 Bump versions to 0.0.6-pre 2015-11-30 18:19:09 +02:00
Joonas Javanainen
1babfdbef2 Release: 0.0.5 2015-11-30 18:15:21 +02:00
Joonas Javanainen
9ed505f5df Upgrade to Glium 0.12 2015-11-30 18:14:24 +02:00
Joonas Javanainen
c4a3605f49 Upgrade glium and libc 2015-11-14 14:36:18 +02:00
Joonas Javanainen
fed60b90e2 Bump versions to 0.0.5-pre 2015-10-26 19:40:57 +02:00
Joonas Javanainen
0c1ac95d44 Release: 0.0.4 2015-10-26 19:35:37 +02:00
Joonas Javanainen
5f63372be6 More test_window_impl work 2015-10-18 13:39:23 +03:00
Joonas Javanainen
1ef649900f ImVec2/ImVec4 conversions 2015-10-18 13:33:14 +03:00
Joonas Javanainen
4d378606f1 Preliminary text input stuff 2015-10-18 13:28:11 +03:00
Joonas Javanainen
8ec34e0701 Fix input character passing
escape_default is actually not the right function here, because it is
meant for escaping strings with C-like rules.

For example, character " becomes the string \"

Since Strings are UTF-8, we can just directly allocate a String as an
intermediate buffer.
2015-10-18 12:37:14 +03:00
Joonas Javanainen
20bf8cd7f0 Merge pull request #9 from Twinklebear/master
Support for Text Input
2015-10-18 10:35:28 +03:00
Will Usher
2fa549bcc9 Wrap ProgramChooserCreationError properly 2015-10-17 14:14:27 -06:00
Will Usher
064235f8c3 Clean up debug logging in example event handling 2015-10-17 13:51:49 -06:00
Will Usher
6eb3ffefdf Encode string of UTF8 chars using encode_default API
Using encode_utf8 will be better when it stabilizes since we won't need
the String intermediate and can go directly to a Vec<u8>.

Update to glium 0.10 to resolve ctrl/shift/etc virtual keycodes on Win10
2015-10-17 13:51:40 -06:00
Will Usher
238f5fead1 Cleaner method for sending keys to ImGui across platforms
Use Virtual Key codes however glutin is missing virtual key codes for
Ctrl/Shift and such on my Win10 machines
2015-10-17 13:51:29 -06:00
Will Usher
8520d0e245 Starting to work on keyboard input
Update examples to use keyboard input
2015-10-17 13:51:21 -06:00
Joonas Javanainen
2c704c2ba7 Oops! Missed one version bump 2015-10-17 22:37:38 +03:00
Joonas Javanainen
96e29c8db8 Merge pull request #10 from matklad/expose-fps
add function to get framerate
2015-10-17 22:37:10 +03:00
Aleksey Kladov
9f38a831c6 add function to get framerate 2015-10-17 15:44:11 +03:00
Joonas Javanainen
4a7d6a3223 Bump versions to 0.0.4-pre 2015-09-27 16:53:02 +03:00
Joonas Javanainen
05817c10a6 Release: 0.0.3 2015-09-27 16:52:34 +03:00
Joonas Javanainen
32f789ae26 Upgrade to Glium 0.9.0 2015-09-27 16:02:57 +03:00
Joonas Javanainen
05b3067aba Remove SDL2 integration
It's too simple and not worth having in this library
2015-09-27 15:58:04 +03:00