Commit Graph

973 Commits

Author SHA1 Message Date
vurtun
0207642018 Merge branch 'glegris-sdl1.2' 2016-04-26 14:47:51 +02:00
vurtun
4a071b61b0 Added text input and fixed some style issues
Text manipulation in SDL1.2 is quite a pain to say the least. But
since this demo is already quite limited in some aspects I think it
is fine to just get things running. That being said if used seriously
then text input still needs some work.
2016-04-26 14:43:43 +02:00
vurtun
b8e56beceb Merge branch 'sdl1.2' of https://github.com/glegris/nuklear into glegris-sdl1.2 2016-04-26 13:26:27 +02:00
glegris
6e864e076c Add generic comments to explain that line thickness is not used by default 2016-04-25 18:16:29 +02:00
glegris
213a84fcf3 Renamed the sdl1.2 directory to sdl1.2_gfx 2016-04-25 17:59:55 +02:00
glegris
1ce95717bf Add support for the NK_COMMAND_RECT_MULTI_COLOR command and remove the static polygon pointer buffer. 2016-04-25 17:52:49 +02:00
vurtun
8ebd0afe79 Fixed window position/size modification
Fixed windows ignoring changes to its position, size or both if a
group layout is used.
2016-04-25 14:11:35 +02:00
vurtun
62ff1861a4 Hopefully fixed retina display issues #111 #74
I personally do not have a retina display, but I added some changes
to all `GLFW` demos/examples. If there are still issues please
report back to me what is not working correct (please test out clipping
by playing around with scrollbars as well)
2016-04-25 14:07:04 +02:00
Micha Mettke
e8ca192f7c Merge pull request #110 from andreygursky/fix-typo
example: fix typo
2016-04-25 02:34:01 -07:00
vurtun
1481be82e8 Merge branch 'SquareWave-master' 2016-04-25 10:13:56 +02:00
vurtun
2a230e2bd6 Removed shadows variable warning 2016-04-25 10:13:09 +02:00
glegris
1a794962ed Add demo using SDL 1.2. It's useful for platforms not supported by SDL2. 2016-04-25 09:59:53 +02:00
Doug Thayer
72b362325d Fix issue with adding multiple fonts
The total range count grabbed from nk_range_count was being used
to get the glyph count, which resulted in a buffer over-read.
2016-04-24 14:05:34 -07:00
Martins Mozeiko
c4cf1ad23e Created demo using Win32 GDI+ for rendering. Uses VS2015 for compiler. 2016-04-24 12:10:57 -07:00
Andrey Gursky
590c27d40f example: fix typo 2016-04-23 22:01:01 +02:00
Micha Mettke
05ba026b79 Merge pull request #85 from mattn/fix-error
Fix compilation error
2016-04-23 12:07:37 -07:00
vurtun
7fab9fbd5c Merge branch 'mmozeiko-d3d11' 2016-04-23 20:55:42 -07:00
vurtun
b86a153b33 Removed C89 errors 2016-04-23 20:54:50 -07:00
Martins Mozeiko
062032e933 Created demo using Direct3D 11 for rendering. Uses VS2015 for compiler.
Also fixes wrong location of GlobalUnlock in GDI rendering demo.
2016-04-23 11:20:47 -07:00
vurtun
412f65fa65 Fix #108 pushing wrong texture in empty draw_list
Fixed a small copy & paste error which pushes the wrong texture
into an empty draw list. In normal cases this never occurs but is
still a big if used independent of libraries use cases.
2016-04-23 16:29:58 +02:00
Micha Mettke
87efb61a9f Merge pull request #102 from mmozeiko/gdi
Demo with Win32 GDI rendering
2016-04-23 03:43:13 -07:00
vurtun
5da8216f71 Fixed property text input
Inserting text into a property would cause an assert because
I forgot to set the upper bounds of the text edit inside the property.
2016-04-23 12:28:45 +02:00
vurtun
bdbc8f9c26 Removed private underscore of nk_tree__push #106
`nk_tree__push` was not supposed to be seen as private but more like
the more extended way of handling duplicate tree elements. But I used
double underscore which is the general indicator for private. I renamed
it know to nk_tree_push_id, to hopefully make it clearer.
2016-04-23 10:34:50 +02:00
vurtun
e5227c5ebc Merge branch 'hobbitalastair-master' 2016-04-22 22:26:50 +02:00
vurtun
dd8ea556de Merge branch 'master' of https://github.com/hobbitalastair/nuklear into hobbitalastair-master 2016-04-22 22:25:49 +02:00
Alastair Hughes
a0710d941f Added an error message if the display can't be opened 2016-04-23 07:54:05 +12:00
Martins Mozeiko
d6ada00cb8 Created demo using Win32 GDI rendering. Uses VS2015 for compiler. 2016-04-22 01:21:19 -07:00
Martins Mozeiko
7536d0d618 Cleaning up VS2015 compiler warnings. 2016-04-21 20:55:26 -07:00
vurtun
3929ec8dee Added some additional documentation 2016-04-21 17:35:52 +02:00
vurtun
bc8db2e3f3 Fixed #97 with text input at end of edit field
This commit fixes a bug that occurs if you move the cursor inside
text and then back to the end of the text and insert a character.
Caused was the bug by an incorrect check if the cursor is at the
end of the string.
2016-04-21 12:39:07 +02:00
Micha Mettke
68d274c094 Merge pull request #80 from r0fls/patch-1
Added travis-ci build badge to readme
2016-04-21 12:25:45 +02:00
vurtun
7c9659f3b8 Fixed #99 forgot to set clipboard callbacks
Previously if you use `nk_edit_string` and use flag
`NK_EDIT_CLIPBOARD`, callbacks were not passed. I only tested it with
`nk_edit_buffer` and set the callbacks directly. This wrong behavior
is now fixed and should work copy & paste should behave correctly.
2016-04-21 11:04:18 +02:00
vurtun
ca4d5bad8c Fixed blurry font for examples
Oversampling for the default font is tweaked for the default font
with height 13. I set the wrong height for all examples which should
now be fixed.
2016-04-20 19:53:26 +02:00
vurtun
7ccd95f2f1 Reverted qsort back to own implementation
Forgot the remove some test code for the last commit.
2016-04-20 18:36:51 +02:00
vurtun
1d7f0244f9 Revert float '=' cond and oversample default font
I previously used a conditional style so I don't have to compare
floats directly with eachother because of warning. This caused some
bugs and I now reverted back all conditions back to normal.
In addition I oversampled the default font to make it look better.
2016-04-20 18:28:04 +02:00
vurtun
18b93fcc8a Fixed #90 cppcheck warning and errors
Thanks to @codemeow I fixed some bugs and warnings found with
cppcheck. NOTE: it seems like all static analyzer fail to
detect the assert macro or hate combining assert ans if checks.
2016-04-20 10:31:20 +02:00
vurtun
4a68332330 Merge branch 'ittner-user-default-compiler' 2016-04-20 08:47:04 +02:00
Yasuhiro Matsumoto
af5a1345d0 Fix compilation error 2016-04-20 10:46:48 +09:00
Alexandre Erwin Ittner
72e9496768 Use standard C compiler by default
Always use the standard compiler as defined by the environment
variable CC. User can set it when a different compiler if required
(e.g. CC=clang make)
2016-04-19 21:44:46 -03:00
Raphael Deem
4485a1f42e Added travis-ci build badge to readme 2016-04-19 15:44:11 -07:00
vurtun
092f463ea9 Added Travis CI file 2016-04-19 21:20:13 +02:00
vurtun
4d02cf9c80 Removed unused variable 2016-04-19 19:46:13 +02:00
Micha Mettke
a4e6859638 Merge pull request #75 from fdb/patch-1
Fix a small typo in README
2016-04-19 18:17:20 +02:00
Frederik De Bleser
d4967c0da3 Fix a small typo in README 2016-04-19 17:01:41 +02:00
Micha Mettke
2de6a021f3 Merge pull request #73 from ehmry/master
correct type definitions without NK_INCLUDE_FIXED_TYPES
2016-04-19 16:52:01 +02:00
vurtun
6b5a4f16e8 Merge branch 'fdb-osx-support' 2016-04-19 16:47:09 +02:00
Emery Hemingway
92f5257e92 correct type definitions without NK_INCLUDE_FIXED_TYPES 2016-04-19 15:28:44 +02:00
Frederik De Bleser
c2ea5d9927 Set OpenGL profile in SDL
This ensures compatibility with OS X's 1.5 shader version.
2016-04-19 14:05:59 +02:00
Micha Mettke
0aee386470 Merge pull request #71 from tversteeg/master
Add .gitattributes file
2016-04-19 13:56:05 +02:00
Frederik De Bleser
a88293a647 Update Allegro for OS X 2016-04-19 13:55:15 +02:00