Commit ccc60b96 authored by Hanspeter Portner's avatar Hanspeter Portner

Squashed 'nuklear/' changes from 2638e1b..665b266

665b266 omk: retain history and scroll-state in textedit.
0bd758e Fix invalid y_offset bug in nk_group_begin.
67b8747 fix NK_COMMAND_ARC/NK_COMMAND_ARC_FILLED.
c5205f7 omk: don't clear draw_list.
cef768d omk: fix lexer code to work with utf8.
9f1a14c add support for syntax highlighting
7e710ff Merge pull request #650 from nathanrw/master
cf05d73 Add reference to pynk
1acb673 Merge pull request #649 from Dickby/master
0dabcdd correct major/minor version of opengl in x11_opengl2
94c0412 Fixed #647 window open/close flickering
REVERT: 2638e1b omk: retain history and scroll-state in textedit.
REVERT: f32342b Fix invalid y_offset bug in nk_group_begin.
REVERT: 7519da8 fix NK_COMMAND_ARC/NK_COMMAND_ARC_FILLED.
REVERT: 72c37db omk: don't clear draw_list.
REVERT: 5a65e52 omk: fix lexer code to work with utf8.
REVERT: 92deced add support for syntax highlighting

git-subtree-dir: nuklear
git-subtree-split: 665b26680dec35c6d02ef423cc09af8bdcc0e53b
parent 1df39f01
......@@ -102,7 +102,9 @@ languages. Furthermore there are no guarantee that all bindings will always be k
- [Chicken](https://github.com/wasamasa/nuklear) by wasamasa@github.com
- [Nim](https://github.com/zacharycarter/nuklear-nim) by zacharycarter@github.com
- [Lua/Löve2d](https://github.com/keharriso/love-nuklear) by Kevin Harrison
- [Python](https://github.com/billsix/pyNuklear) by William Emerison Six
- Python
- [pyNuklear](https://github.com/billsix/pyNuklear) by William Emerison Six (ctypes-based wrapper)
- [pynk](https://github.com/nathanrw/nuklear-cffi) by nathanrw@github.com (cffi binding)
- [CSharp/.NET](https://github.com/cartman300/NuklearDotNet) by cartman300@github.com
## Credits
......
......@@ -211,8 +211,8 @@ int main(void)
glContext = glXCreateNewContext(win.dpy, win.fbc, GLX_RGBA_TYPE, 0, True);
} else {
GLint attr[] = {
GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 0,
GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
GLX_CONTEXT_MINOR_VERSION_ARB, 2,
None
};
glContext = create_context(win.dpy, win.fbc, 0, True, attr);
......
......@@ -19097,7 +19097,7 @@ nk_build(struct nk_context *ctx)
cmd = nk_ptr_add(struct nk_command, buffer, it->buffer.last);
while (next && ((next->buffer.last == next->buffer.begin) ||
(next->flags & NK_WINDOW_HIDDEN)))
(next->flags & NK_WINDOW_HIDDEN) || next->seq != ctx->seq))
next = next->next; /* skip empty command buffers */
if (next) cmd->next = next->buffer.begin;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment