Commit Graph

910 Commits

Author SHA1 Message Date
vurtun
7810bc20bd Changed multi context chart name 2016-05-05 21:18:31 +02:00
vurtun
4068a8248e Merge branch 'multichart-extension' of https://github.com/jviki/nuklear into jviki-multichart-extension 2016-05-05 21:07:58 +02:00
Jan Viktorin
86547049df Support multiple data sets in a single chart
This patch hacks the chart API to support display of multiple data sets in a
single chart instances. Tested briefly with the line chart.

Signed-off-by: Jan Viktorin <iviktorin@fit.vutbr.cz>
2016-05-05 19:43:40 +02:00
vurtun
a5c4094a1d Added High DPI flag to SDL2 backends 2016-05-05 18:44:07 +02:00
vurtun
33185df10a Fixed wrong border line width for popups 2016-05-03 22:17:08 +02:00
vurtun
cc629f45ca Enhanced nk_tree_push_id uniqueness #106
Previously I only used the `__FILE__` and a user `ID` to make
sure to get an unqiue identifier out of it. Like @ands pointed out
this is not enough. Since it is possible to have multipe instances
with the same `title` in the same `__FILE__`. So to fix that I had
the idea to string concat `__FILE__` and `__LINE__` into a string.
This allows to have the same sequence of `IDs` in different places
in one `__FILE__`.
2016-05-03 13:23:04 +02:00
vurtun
31938dac3a Removed unnecessary menu clipping #119 2016-05-02 15:28:29 +02:00
Micha Mettke
c691d4eda2 Merge pull request #120 from tcyrus/patch-1
Update Readme.md
2016-05-02 15:07:44 +02:00
Timothy Cyrus
4bcd5a36c5 Update Readme.md
Change PNG Badge to SVG and other tiny fixes
2016-05-02 08:44:22 -04:00
vurtun
35d302ee8e Fixed windows demos 2016-05-01 10:33:51 -07:00
vurtun
e8fe41584d Added color picker into x11 opengl demos 2016-05-01 19:15:19 +02:00
vurtun
953cc967bb Converted windows demos into singe header files 2016-05-01 19:14:48 +02:00
vurtun
66ce0ce8e5 Added nk_item_any_active for #107 and fixed typo
Previously it was not possible to check if currently any window or
widget is active. To fix that I added function `nk_item_any_active`.
To get correct result you should only call it after all UI code
ran but before calling `nk_clear`. There is currently no other way to
achive the same result inside UI code.
2016-04-30 22:27:29 +02:00
vurtun
a4eda78f3f Fixed x11 opengl3 demo 2016-04-30 19:54:29 +02:00
vurtun
1be2f10621 Added xlib OpenGL version 2 demo 2016-04-30 17:43:02 +02:00
vurtun
f5dc2906a8 Converted backend demos into single header files 2016-04-30 17:09:01 +02:00
vurtun
a2aaedbed0 Merge branch 'master' of https://github.com/vurtun/gui 2016-04-30 14:51:49 +02:00
vurtun
8f6d27072c Fixed extended windows demo errors 2016-04-30 11:24:59 -07:00
vurtun
727e6f0caf Added pure X11/OpenGL demo 2016-04-30 14:50:54 +02:00
vurtun
12d4ed0115 Fixed comment copy & paste fail 2016-04-30 14:49:28 +02:00
vurtun
fa01e2a0db Fixed grapped dragging behavior #116
Fixed mouse grapping emulation for progressbars and window position
dragging which previously still got triggered if other widgets were
being dragged.
2016-04-29 17:25:49 +02:00
vurtun
95beac8cc2 Removed unused enum 2016-04-29 17:06:55 +02:00
vurtun
eb7b0847b6 Fixed build for optional examples 2016-04-29 17:06:31 +02:00
vurtun
34a9405e69 Fixed C++ demo errors 2016-04-29 14:31:27 +02:00
vurtun
389176ef4b Added additional SDL/GLFW OpenGL 2.2 demo 2016-04-29 14:07:08 +02:00
vurtun
154ffb1133 Hopefully fixed SDL rendering for High DPI display 2016-04-29 13:16:18 +02:00
vurtun
aceff660ff updated travis CI 2016-04-29 12:59:30 +02:00
vurtun
601f1bb521 Renamed demo directories 2016-04-29 12:03:20 +02:00
vurtun
5483b7d625 Updated Readme 2016-04-28 23:54:13 +02:00
vurtun
c7d3901e05 Enhanced widget click and drag interaction #116
It is now possible to control button click behavior to trigger either
on button pressed or button released. By default nuklear now used
on button pressed but `#define NK_BUTTON_TRIGGER_ON_RELEASE` lets
you change button behavior to trigger on release. I furthermore
enhanced slider dragging behavior to not force you to hover the
slider at all times.
2016-04-28 22:51:09 +02:00
vurtun
8a01de120a Restructured demos and examples
All platform and renderbackend independent examples are now optional
demos for all platforms in `demo/`. Moving some demos from `example/`
provides an easier way to test GUI concepts for users and simplifies
maintenance.
2016-04-28 17:01:19 +02:00
vurtun
8f03b5bcdd Set default types for nk_uint/nk_int to u/int #115 2016-04-27 23:15:52 +02:00
vurtun
bbe282a272 Hopefully fixed high DPI display mouse mapping #74 2016-04-27 13:08:31 +02:00
vurtun
4d36ca410e Fixed comment typo 2016-04-27 13:07:50 +02:00
vurtun
cdaa1f4bda Restore default caps in GLFW/SDL demos #105
All modifed state changed by the demo rendering functions is now set
to default values after being called. I tried to save and restore all
relavent state but for some reason function glBlendEquationSeperate
is not defined for me. So I decided to make it as easy as possible
for me and just set everything to default. This means you have to
either save and restore or reset your own OpenGL state after calling
`nk_xxx_render`. I know it is not perfect but I have no better
solution at this point in time.
2016-04-26 18:24:43 +02:00
Micha Mettke
4de258c256 Merge pull request #112 from mmozeiko/gdip
Demo with Win32 GDI+ rendering
2016-04-26 07:21:27 -07:00
vurtun
9974a55eb1 Fixed properties edit field width calculation
Editfield width inside properties were previously calculate by text
length + padding and always the size of the edit cursor, even in case
were no one is editing the property. Now the cursor size is only
added while editing.
2016-04-26 14:48:03 +02:00
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