Commit Graph

1310 Commits

Author SHA1 Message Date
vurtun
7d5648db30 Added result flags to nk_convert 2017-04-08 09:46:40 +02:00
vurtun
5cf6f204b7 Removed wrong nk_window_is_closed in demos 2017-04-06 09:51:50 +02:00
Micha Mettke
0d010a39a4 Merge pull request #393 from nsawa/fix_gcc_warning_in_nk_end
Fix gcc warning in nk_end().
2017-04-05 08:26:16 +02:00
Naoyuki Sawa
b3963bf731 Fix gcc warning in nk_end(). 2017-04-05 10:30:07 +09:00
vurtun
274d9c416b Merge branch 'master' of https://github.com/vurtun/gui 2017-04-04 19:02:16 +02:00
vurtun
67f266a560 Fixed #388 crashing hidden window on popup click 2017-04-04 16:31:12 +02:00
Micha Mettke
58b7faff4e Merge pull request #389 from rokups/fixes
Several fixes
2017-04-04 16:17:21 +02:00
Micha Mettke
13d9eb41db Merge pull request #391 from cxong/master
Remove redundant assign
2017-04-04 15:58:50 +02:00
Cong
9b9f88e907 Remove redundant assign 2017-04-02 13:57:45 +10:00
Rokas Kupstys
80db75a068 Fix using uninitialized variable as condition. 2017-03-30 15:11:42 +03:00
Rokas Kupstys
25e6ba2597 Fix examples to use nk_vec2 in nk_input_scroll() calls. 2017-03-30 13:46:39 +03:00
Micha Mettke
204e2bdb16 Merge pull request #382 from nsawa/fix_warning_unused_variable
fix: warning unused variable in nk_finish()
2017-03-26 10:09:43 +02:00
Naoyuki Sawa
b24329d34a fix: warning unused variable in nk_finish() 2017-03-26 10:06:09 +09:00
vurtun
1a87c13d84 Fixed multiline commment in commented out code 2017-03-25 23:29:42 +01:00
vurtun
2a0942f04f Fixed #378 popup blocking NK_WINDOW_BACKGROUND windows 2017-03-25 14:57:44 +01:00
vurtun
944af0eb4c Fixed windows closing behavior 2017-03-25 09:12:38 +01:00
vurtun
45af48aab3 Added horizontal scrolling requested in #377 2017-03-21 21:22:59 +01:00
vurtun
23eea231d8 Added horizontal scrolling 2017-03-21 21:21:58 +01:00
vurtun
a979372909 Fixed #375 long window title drawing bug 2017-03-18 22:34:13 +01:00
vurtun
8594d482eb Merge branch 'shyhisi-mater' 2017-03-18 18:11:01 +01:00
vurtun
6bb00890fb Fixed PR styling issues 2017-03-18 18:09:54 +01:00
vurtun
e7ae9bfff5 Merge branch 'master' of https://github.com/skyhisi/nuklear into shyhisi-mater 2017-03-18 17:26:19 +01:00
Micha Mettke
46e55e14f3 Merge pull request #373 from RUSshy/patch-1
Made properties static or they can't be changed
2017-03-17 21:34:09 +01:00
RUSshy
86d4c222e3 Made properties static or they can't be changed 2017-03-17 20:24:28 +01:00
Silas Parker
0073110c9b Xlib: Add font stack push function and copy/paste support 2017-03-16 15:39:12 +00:00
vurtun
e77b723d98 Removed unused defines and parameters 2017-03-15 18:19:21 +01:00
vurtun
99ea7c4b53 Fixed const warnings 2017-03-15 18:18:00 +01:00
Micha Mettke
2f63716335 Merge pull request #369 from cxong/patch-5
Remove const cast of endptr in nk_strto* functions
2017-03-15 18:10:16 +01:00
Cong
2e4db87ed1 Remove const cast of endptr in nk_strto* functions
Change `endptr` to `const char **` and avoid const cast.
Should not break existing code passing `char **` as `endptr`.
2017-03-15 22:22:53 +11:00
vurtun
436bbcd18e Merge branch 'ricanteja-master' 2017-03-12 13:31:08 +01:00
vurtun
7c7e15e5c3 Fixed some styling issues in sfml demos 2017-03-12 13:30:14 +01:00
vurtun
220c314df4 Merge branch 'master' of https://github.com/ricanteja/nuklear into ricanteja-master 2017-03-12 13:02:55 +01:00
Micha Mettke
93193e4294 Merge pull request #366 from cxong/patch-1
Fix unary operator clang warning
2017-03-12 13:01:49 +01:00
Cong
7134bf73b5 Fix unary operator clang warning 2017-03-12 22:43:18 +11:00
Micha Mettke
e6a6fe5b21 fixed #363 wrong example in documentation 2017-03-09 10:50:30 +01:00
vurtun
d5ea545a2b Hopefully fixed #362 text input filtering 2017-03-04 13:56:40 +01:00
vurtun
284772c00d fixed #361 group closable window flag 2017-03-04 13:10:33 +01:00
Ricardo Antonio Tejada
3d77394bd2 Forgot to edit link to point to SFML webpage and not Allegro.. 2017-03-01 22:25:42 -05:00
Ricardo Antonio Tejada
1574367121 Makefiles done. 2017-03-01 22:23:21 -05:00
Ricardo Antonio Tejada
c6bfe1c157 Finally! I fixed that bug that I had. sf::Mouse::setPosition was setting the position of the cursor to desktop coordinates not window coordinates. 2017-03-01 17:17:43 -05:00
Ricardo Antonio Tejada
63e98d90bd Almost ready for merge. Need to fix bug with mouse movement. Need to implement clipboard support. Lastly need to write ReadMe on instructions for building. 2017-02-28 19:32:55 -05:00
vurtun
443a058dd8 Merge branch 'ClassJG-master' 2017-02-25 22:54:48 +01:00
vurtun
e5c1cf9d70 Cleaned up custom draw commands to better fit
Had to change some small things to make everything work for a
general case instead of vertex draw list only. Furthermore I
don't want a custom widget inside nuklear so I removed it.
Feel free to add it back into your own version.
2017-02-25 22:50:37 +01:00
ClaasJG
4c25cd34f5 Added a new command type: NK_COMMAND_CUSTOM
Added a new command type 'NK_COMMAND_CUSTOM'.
A custom command contains a callback that will be called to fill the draw list.

Usage: 
static void custom_convert(struct nk_draw_list *list,
    short x, short y, unsigned short w, unsigned short h,
    nk_handle callback_data){/*Fill draw list.*/}

[...]nk_begin[...]
nk_custom(ctx, customConvert, nk_handle_id(0));

The handle can be used to pass data.
2017-02-25 14:13:08 +01:00
vurtun
064e31f3db Added assert to prevent group with closable flag 2017-02-24 19:18:42 +01:00
vurtun
e7d02b4a45 Updated Readme 2017-02-24 19:18:27 +01:00
Ricardo Antonio Tejada
5007519ae7 Dumped the pure SFML folder. Got it working enough to realize that it just ran too slow to continue wasting time on it. SFML creates a OpenGL context anyway so users can drop in the nk_sfml_gl2.h and not need anything else. I'll have to add this in the readme. Tried to make my code as similar to other demos for sake of consistency. 2017-02-23 02:02:59 -05:00
vurtun
4ed15f5a35 Fixed Readme layouting 2017-02-21 19:06:37 +01:00
vurtun
82b8ac0445 Merge branch 'embox-master' 2017-02-21 19:00:32 +01:00
vurtun
eaf104db3f Merge branch 'master' of https://github.com/embox/nuklear into embox-master 2017-02-21 18:59:31 +01:00