mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,398 Commits 16 Branches 10 Tags 20 MiB
5fc8a250aa
Commit Graph

1398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Micha Mettke
5f78107fc5 Added nim language bindings to Readme 2017-02-20 14:32:12 +01:00
Dmitry Hrabrov
67aaa11f5d Return global clipping back 2017-02-18 15:24:45 +03:00
Ricardo Antonio Tejada
73b0b945b4 Added OpenGL3 for SFML and also working on "pure" SFML renderer. 2017-02-17 17:54:24 -05:00
Anton Bondarev
aac2d71740 Make NK_API 'static inline' for NK_PRIVATE version 
Fixed definition for C89 standard
 2017-02-13 13:39:56 +03:00
Ricardo Antonio Tejada
2babe51576 Fixed the clipping glitch (bug that caused the window borders and backgrounds to not be rendered). 
Fixed text input bug that could cause the program to crash.
 2017-02-13 01:59:32 -05:00
Micha Mettke
cd0969c3a0 Merge pull request #341 from mmozeiko/master 
GDI+ simplified image loading, added error checking and image freeing
 2017-02-11 17:51:24 +01:00
Martins Mozeiko
aa3ffd6917 GDI+ simplified image loading, added error checking and image freeing 2017-02-10 00:41:31 -08:00
Ricardo Antonio Tejada
2d1ea95600 Adding SFML backends for Nuklear. Working on porting over the OpenGL 2 renderer from the GLFW and SDL examples. 
Still some rendering bugs I would like some help on.
 2017-02-09 20:54:28 -05:00
Dmitry Hrabrov
7483f7ce38 Fix panel clipping 
`layout->bounds` cannot be used (loc 16615) since we modify it up here:
`layout->bounds.x += panel_padding.x;`  (16471)
`layout->bounds.w -= 2*panel_padding.x;` (16472)
Because of it there was no ability to `nk_draw_image` attached to window's edge. There alway was empty lines of right and left.

This code breaks the other's code. Popups, for example. My paddings are 10px. To show popup at (20,20) without this patch I must use `nk_rect(10, 20, ...`. With this patch I must use `nk_rect(20, 20, ...`, not depending on paddings. I think (20,20) is a correct constant for (20,20) coordinate.
 2017-02-09 17:13:52 +03:00
Anton Bondarev
6fa8424d6e Make NK_API 'static inline' for NK_PRIVATE version 2017-02-06 16:43:33 +03:00
Micha Mettke
d536d4e89a Merge pull request #337 from DeXP/master 
GDI+ split rendering GUI and clear surface
 2017-02-05 10:39:28 +01:00
Dmitry Hrabrov
35e8558be4 GDI+ split rendering GUI and clear surface 
For example, I draw something via GDI+. Now I can call `nk_gdip_render_gui(AA)` and it will not erase my drawings, just will draw on top. 
Previos API was not changed.
 2017-02-04 18:24:49 +03:00
Micha Mettke
2df399ecda Merge pull request #336 from DeXP/master 
GDI+ text transparent background fix
 2017-02-04 16:12:00 +01:00
Dmitry Hrabrov
4442697ee0 GDI+ set text color only once 2017-02-04 12:53:19 +03:00