64 Commits

Author SHA1 Message Date
Cameron Hart
2a82d19eff Merge branch 'upstream' into input 2016-06-04 10:44:33 +10:00
Joonas Javanainen
2be842968e Merge pull request #25 from orhanbalci/master
combo and list_box api wrapper
2016-05-29 22:47:44 +03:00
Miguel Michelson
7a7de21135 rename args on columns methods in order to be consitent with ig* arg methods 2016-05-28 20:36:47 -03:00
Miguel Michelson
a4dba71d1a more on formatting 2016-05-28 20:09:05 -03:00
orhanbalci
6e184ad4d5 formatting fixed, unnecessary functions removed 2016-05-28 14:37:38 +03:00
Miguel Michelson
5ad669e9c0 remove extra breaklines 2016-05-27 21:51:27 -03:00
Miguel Michelson
a1ba49af43 remove tree_pop method 2016-05-27 21:41:35 -03:00
Miguel Michelson
cdb7a929ee rename args and declare return types 2016-05-27 21:29:31 -03:00
orhanbalci
50b63304d4 as_ptr visibility fix 2016-05-27 22:30:28 +03:00
orhanbalci
58e59810ac test file reverted
callback combo interface removed
2016-05-27 22:26:29 +03:00
orhanbalci
bd7e418878 combo with callback function added 2016-05-27 01:19:35 +03:00
orhanbalci
7d56866c86 combo and listbox functions added 2016-05-26 00:21:53 +03:00
Miguel Michelson
e7dfdd2518 use ImguiString 2016-05-25 02:06:14 -03:00
Miguel Michelson
3019f15b92 implement columns 2016-05-25 01:55:50 -03:00
Joonas Javanainen
ac5d8cfcd1 Merge pull request #21 from mneumann/pub_as_ptr
Make ImStr#as_ptr public
2016-05-06 15:46:50 +03:00
Michael Neumann
620c7215f0 Make ImStr#as_ptr public 2016-05-06 10:04:01 +02:00
Joonas Javanainen
19a838104f Pass texture id to imgui, and assert during rendering 2016-03-26 19:18:05 +02:00
Cameron Hart
4bfd697e9b Merge branch 'master' into input 2016-01-23 14:04:16 +11: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
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
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
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
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
8520d0e245 Starting to work on keyboard input
Update examples to use keyboard input
2015-10-17 13:51:21 -06:00
Aleksey Kladov
9f38a831c6 add function to get framerate 2015-10-17 15:44:11 +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
Joonas Javanainen
91eec219f6 Unsafe function to get the "current UI" out of thin air 2015-09-27 15:57:08 +03:00
Joonas Javanainen
f301da3694 Expose more ImGuiIO functionality 2015-08-30 22:17:01 +03:00
Joonas Javanainen
bd2930e758 Simplify igGetIO calls 2015-08-26 13:37:37 +01:00
Joonas Javanainen
5baad7094b Use 'p lifetime (as in Parameter) consistently 2015-08-26 12:46:29 +01:00
Joonas Javanainen
e875305b29 Overhaul ImStr constructors 2015-08-26 12:43:08 +01:00
Joonas Javanainen
9b2d199d3d Style editor 2015-08-26 12:08:37 +01:00
Joonas Javanainen
b7295ae9ae Small button 2015-08-26 12:00:44 +01:00
Joonas Javanainen
a62e6ac146 ImStr can implement Clone 2015-08-26 11:54:19 +01:00
Joonas Javanainen
b14999b5a2 Trees 2015-08-26 11:54:19 +01:00
Joonas Javanainen
fa5bd75bb3 Fix formatting
I don't know where that 3 spaces nonsense came from... :/
2015-08-25 22:14:30 +01:00
Joonas Javanainen
545c80f309 Split ffi module into imgui-sys 2015-08-23 09:56:13 +03:00
Joonas Javanainen
3a550208c9 Frame -> Ui 2015-08-23 09:41:03 +03:00
Joonas Javanainen
f6f5dc6162 Avoid extra copy when using im_str! formatting 2015-08-21 18:33:12 +03:00