Commit Graph

1244 Commits

Author SHA1 Message Date
Micha Mettke
3123ba0167 Merge pull request #330 from DeXP/master
Remove warning: 'nk_to_upper' defined but not used
2017-01-24 22:28:13 +01:00
vurtun
f5447a8406 Fixed typo _WIN64 instead of __WIN64
This is one of these highly embarassing typos I completly missed for a
long time.
2017-01-24 22:18:45 +01:00
vurtun
6b27c20231 Fixed #331 with graceful x11 window closing 2017-01-23 19:33:58 +01:00
Dmitry Hrabrov
16c2dddae4 Fix typo 2017-01-23 11:19:27 +03:00
Dmitry Hrabrov
7d52c0de67 Remove warning: 'nk_to_upper' defined but not used
There is function `NK_INTERN int nk_to_upper(int c)` in `UTIL` section. Implementation is almost the same to `NK_INTERN int nk_to_lower(int c)`. But only `nk_to_lower` used in Nuklear's code. To remove this warning we can: 
1) Comment i.e. remove `nk_to_upper` from code. But it can break someone's code, if he used it in module with `NK_IMPLEMENTATION` defined.
2) Hide it under define. Same. 
3) Just use it somewhere in code. 
I replaced two calls of `nk_to_lower` to `nk_to_upper`. It removes the warning, code works the same. The bad side - complication of the code. "Why `nk_to_upper` is used here, but not `nk_to_lower` as one line up?"
Maybe there exists better solution? Or just add the comment about this line to code?
2017-01-23 11:02:20 +03:00
Micha Mettke
2e9c4ee0ab Merge pull request #329 from DeXP/master
Remove unused panel warnings
2017-01-22 15:37:52 +01:00
DeXP
4a3573b032 Merge branch 'master' of git://github.com/vurtun/nuklear 2017-01-22 16:09:12 +03:00
Dmitry Hrabrov
36c60548a6 Remove unused panel warnings
When NDEBUG defined:
nuklear.h: In function 'nk_popup_begin':
nuklear.h:20753:22: warning: variable 'panel' set but not used [-Wunused-but-set-variable]
nuklear.h: In function 'nk_nonblock_begin':
nuklear.h:20850:22: warning: variable 'panel' set but not used [-Wunused-but-set-variable]
2017-01-22 16:00:28 +03:00
Micha Mettke
431e67597c Merge pull request #327 from DeXP/master
GDI+: loading TTF font from file
2017-01-21 19:55:16 +01:00
vurtun
6f8fe8d05b Fixed input capture from hidden or closed windows
Previously if you would call 'nk_window_show' on a currently hot window
the window will keep on taking all input. This wrong behavior is now
fixed.
2017-01-21 19:22:12 +01:00
vurtun
bd44f4fa3a Removed temporary file 2017-01-21 18:55:45 +01:00
vurtun
8892727361 Fixed slider behavior and drawing
Slider is still comming back to haunt me. They never worked like I
wanted them to, but hopefully this is now finally fixed. Previously if
you declared a slider not beginning with 0 it would break and not work.
This behavior is now fixed.
2017-01-21 18:50:31 +01:00
Dmitry Hrabrov
8033c400b4 Added loading TTF font from file
Also font API rename to be the same with images.
2017-01-20 15:09:27 +03:00
Micha Mettke
b544d616e3 Merge pull request #324 from DeXP/master
Define IStream interface
2017-01-19 20:35:03 +01:00
Dmitry Hrabrov
4d957de4a1 Define IStream interface 2017-01-19 22:14:56 +03:00
vurtun
5011a36529 Updated CHANGELOG format and versioning 2017-01-15 21:13:38 +01:00
vurtun
34d0fcd43d Merged #198 with bottom-left corner scaler 2017-01-14 15:22:22 +01:00
vurtun
be7ac9b903 Updated Makefile as of #256 2017-01-14 09:46:13 +01:00
vurtun
aa1f516fa3 Added row template layout example to demo/overview 2017-01-12 20:49:52 +01:00
vurtun
13c785d68b Fixed #322 C89 compiler error 2017-01-12 07:44:35 +01:00
vurtun
f2ea71aaab Merge branch 'master' of https://github.com/vurtun/gui 2017-01-11 23:29:47 +01:00
vurtun
da347eecdd Added additional layouting method 2017-01-11 23:29:26 +01:00
Micha Mettke
14f107b0ab Merge pull request #318 from DeXP/master
GDI+ load font from memory
2017-01-10 14:58:27 +01:00
Dmitry Hrabrov
24f4e3f288 GDI+ load font from memory added
There is new user function: `nk_gdipfont_create_mem`. Added `fontCollection` member to `gdip` structure to automatically clean it up at execution end.
2017-01-07 16:16:03 +03:00
Dmitry Hrabrov
7ab7327fa4 nk_gdip_fill_rect filled pies fix
Added 1px overlap near filled pies. There is no empty space between pie and rectangle now. It was especially conspicuous on red theme.
2017-01-07 14:26:26 +03:00
Micha Mettke
24c756c264 Merge pull request #315 from seibelj/allegro5_impl
Allegro5 nuklear backend and touchscreen support
2017-01-07 11:01:22 +01:00
Micha Mettke
5ad19783c3 Merge pull request #316 from DeXP/master
GDI+ images support
2017-01-07 10:12:40 +01:00
seibelj
7dbd9f910e PR fixes. Removed all keyboard callback code as it can be accomplished with nk_edit flags 2017-01-06 14:09:44 -05:00
seibelj
e6798bc1b4 Removed keyboard callbacks because they are unnecessary 2017-01-06 13:50:31 -05:00
Dmitry Hrabrov
5aeddddd74 Added GDI+ images support 2017-01-06 15:40:01 +03:00
Dmitry Hrabrov
840f539eab Added OLE32 to dependencies list 2017-01-06 15:33:37 +03:00
seibelj
bc6c9c7093 Added readme and keyboard handler example files 2017-01-05 16:00:11 -05:00
seibelj
6d5fba0cbb Removed display checkers because they appear not to work for custom events. Also fixed up whitespace and changed a variable name from nil to none because of objective-c conflicting 2017-01-05 15:24:19 -05:00
seibelj
1cf83d258e Improved soft keyboard support 2017-01-03 13:05:17 -05:00
seibelj
bde7c3c4e9 Fix for multitouch causing issues 2017-01-03 11:13:46 -05:00
seibelj
4e3689a774 Merge branch 'master' into allegro5_impl 2017-01-02 23:14:04 -05:00
vurtun
58afd4f86b Fixed typo inside GLFW demo #311 2017-01-02 23:13:57 -05:00
vurtun
a9330ad892 Fixed closing window bug of minimized windows #291 2017-01-02 23:13:57 -05:00
vurtun
64102b53bb Fixed missing Readme newline 2017-01-02 23:13:57 -05:00
Dmitry Hrabrov
12515cae71 nk_gdip_fill_rect coordinates fix
Fix incorrect button drawing (wrong stroke, empty spaces in stroke line near the corners). Since there are quarters of circle in the angles then lines must be moved to R, not to D.
2017-01-02 23:13:57 -05:00
Anthony Pesch
780d88f1b9 Set window bounds in nk_begin when the window isn't user-resizable 2017-01-02 23:13:57 -05:00
Julius Zint
16c084c5c1 fixed relative path of demo fonts in d3d11 sample 2017-01-02 23:13:57 -05:00
seibelj
73e58012ef Fixes for touch events 2017-01-02 23:12:39 -05:00
seibelj
63e2cbafb6 initial touch support 2017-01-02 21:48:48 -05:00
Micha Mettke
011187b38a Merge pull request #313 from inolen/master
build fix for gcc
2017-01-01 22:16:44 +01:00
Anthony Pesch
baa8ad8482 build fix for gcc 2017-01-01 12:43:36 -08:00
vurtun
e63ae83349 Extended 16-bit scrollbar offsets to 32-bit #312 2016-12-31 20:05:17 +01:00
seibelj
eb58042b1a Merge branch 'master' into allegro5_impl 2016-12-31 14:00:58 -05:00
seibelj
533d5d28ef Much progress on allegro5 impl. Also added SELCT_ALL command 2016-12-31 13:58:57 -05:00
vurtun
a835309973 Fixed typo inside GLFW demo #311 2016-12-31 19:14:47 +01:00