Commit Graph

1020 Commits

Author SHA1 Message Date
Yaroslav Tsarko
80670a2496 Merge remote-tracking branch 'upstream/master' 2016-07-15 15:30:24 +03:00
vurtun
e298956ccc Fixed NK_INCLUDE_COMMAND_USERDATA flag
Fixed compile error if flag NK_INCLUDE_COMMAND_USERDATA was set.
2016-07-15 15:06:29 +03:00
Vinh Truong
b8e533aeb8 Fix nk_input_key to enable keyboard key repeat 2016-07-15 15:06:29 +03:00
vurtun
c6652be288 Merge branch 'phoekz-master' 2016-07-15 13:57:23 +02:00
vurtun
d8adeae85f Merge branch 'master' of https://github.com/phoekz/nuklear into phoekz-master 2016-07-15 13:55:29 +02:00
vurtun
0def503980 Fixed NK_INCLUDE_COMMAND_USERDATA flag
Fixed compile error if flag NK_INCLUDE_COMMAND_USERDATA was set.
2016-07-15 13:48:39 +02:00
vurtun
362afc071a Fixed edit scrollbar and ROM flag
I completely forgot to add the edit scrollbar style and
had a incorrect scrollbar bounds calculation. Both bugs
should now be fixed. Furthermore the edit ROM flag know
prevents any manipulating input instead of all input.
So it should be possible to move or copy inside the edit
field but not to modify the content.
2016-07-14 12:56:41 +02:00
vurtun
db4ff5ad93 Merge branch 'ytsarko-master' 2016-07-12 15:48:15 +02:00
vurtun
d49b669db9 Added function to modify window title 2016-07-12 15:47:53 +02:00
vurtun
def4850b49 Merge branch 'master' of https://github.com/ytsarko/nuklear into ytsarko-master 2016-07-12 15:44:23 +02:00
vurtun
894f07394e Merge branch 'phoekz-popup_toggle_semantics' 2016-07-10 22:31:48 +02:00
Vinh Truong
383d0f94bd Change popup toggling semantics
For gui elements like tree tabs, tree nodes and windows themselves,
you can repeatedly click the same "minimize" region and it keeps
toggling that element. This was not the case with "popup" type of
elements. This commit slightly changes how the popups close once
they are already open.

Like before, the user can close the popup by just clicking outside
the popups region. Now the user can also close the popup by clicking
the "header" region of the popup.
2016-07-10 10:36:28 +03:00
Vinh Truong
3b50eedba4 Fix nk_input_key to enable keyboard key repeat 2016-07-10 01:43:31 +03:00
Micha Mettke
507a264f91 Merge pull request #177 from phoekz/master
Fix incorrect printf token in nk_value_format_byte
2016-07-09 23:22:37 +02:00
Vinh Truong
5b8b9f8832 Fix incorrect printf token in nk_value_format_byte 2016-07-09 23:30:10 +03:00
vurtun
2f9f1259bd Merge branch 'phoekz-master' 2016-07-09 18:22:13 +02:00
Vinh Truong
e1655817b8 Fix fading glyphs with global_alpha < 1 2016-07-09 19:06:17 +03:00
Micha Mettke
e5ce2de621 Merge pull request #164 from cwkx/master
Emscripten support with glfw3 (and shaders) demo at www.cwkx.com/nuklear
2016-07-06 17:59:30 +02:00
Micha Mettke
de7f8863b2 Merge pull request #175 from timothyqiu/tabfixes
Fixes misuse of spaces in GLFW demo Makefiles
2016-07-06 17:46:58 +02:00
Timothy Qiu
440f2f7cbc Fixes misuse of spaces in GLFW demo Makefiles 2016-07-06 09:15:00 +08:00
Yaroslav Tsarko
e3a29e9fdf Merge remote-tracking branch 'upstream/master' 2016-07-01 09:38:27 +03:00
vurtun
605d59bf8e Fixed #173 draw list clearing bug 2016-06-29 06:54:29 +02:00
vurtun
4abd29f2ed Merge branch 'inolen-master' 2016-06-25 10:40:44 +02:00
vurtun
4d390a9c46 Fixed some code style issues
Enforced the correct code style and tab index width of 4 instead of 2.
2016-06-25 10:39:49 +02:00
vurtun
b82cf7251e Merge branch 'master' of https://github.com/inolen/nuklear into inolen-master 2016-06-25 10:32:55 +02:00
Micha Mettke
5ff8901db4 Merge pull request #168 from jwerle/master
make clib friendly
2016-06-25 10:30:33 +02:00
Micha Mettke
6627a63436 Merge pull request #171 from mogud/master
fix macro nk_tree_image_push_id: params error
2016-06-25 10:29:06 +02:00
Anthony Pesch
af451ebee2 Make panels use the max of the scaler size or scrollbar y size when calculating their height
Make horizontal scrollbars use the scrollbar y size when calculating their position
2016-06-23 22:55:37 -07:00
mogud
1b4ea11954 fix macro nk_tree_image_push_id: params error 2016-06-23 14:12:11 +08:00
vurtun
76ba0b2374 Fixed alignment bug after buffer reallocation
Previously if a dynamic back buffer is full and reallocated then the
current allocation alignment will be alignet at the direct memory
address instead of memory address minus size. This is now fixed and
alignment should work correctly.
2016-06-20 20:01:24 +02:00
Joseph Werle
cc57b77565 make clib friendly 2016-06-18 14:12:58 -04:00
Yaroslav Tsarko
3ac1ac5991 some very useful macros (for common MATH and ALIGNMENT operations)
are moved to library interface part in order to use them in client
code (especially in creating nuklear backends)
2016-06-17 12:41:17 +03:00
vurtun
920374bb44 Added scrollbar shortcuts to demos 2016-06-16 20:53:30 +02:00
vurtun
c9f07101f3 Removed shadow variable 2016-06-16 20:48:59 +02:00
vurtun
848d35ea68 Fixed group inside group scrolling
This commit deactivates scrolling for each parent group and window
of a panel to only allow exactly *one* active scrollbar.
2016-06-16 20:25:26 +02:00
vurtun
30087c41ef Fixed missing NULL check
Forgot to check if `nk_input` is NULL
2016-06-16 20:07:18 +02:00
vurtun
c39afae44b Merge branch 'master' of https://github.com/vurtun/nuklear 2016-06-16 16:35:59 +02:00
vurtun
06ec76c3ff Added group scrollbar scroll wheel and shortcuts
It is now possible to use mouse scrolling as well as shortcuts for
windows as well as groups. But there is still some unwanted behavior
if you scroll the window and while scrolling hover over a group then
the group will be scrolled and not the window. I will look into fixing
it.
2016-06-16 16:10:11 +02:00
vurtun
758d9c405a Fixed copy & paste bug in scrollbar implementation
It should now be possible to just click on one of the empty spaces
inside scrollbars to jump one window frame down or up.
2016-06-15 21:34:49 +02:00
vurtun
b020c332d0 Added general scrollbar shortcuts
This commit extends nuklears scrollbar with some basic shortcuts.
Included are page up/down as well as jump to beginning and
end of window. The last scrollbar change is page down/up by mouse
click in empty scrollbar space.
2016-06-15 17:39:14 +02:00
vurtun
e7307ae2fd Fixed text clipping bug inside draw list
Text was previously wrongfully software clipped if text was only
partially visible. The wrong behavior is now fixed and text should
be clipped only if the text is completely outside the clipping rect.
2016-06-15 14:10:32 +02:00
vurtun
4d8738282a Fixed #165 C++11 specific error
Surprising turn out, the C++ standard comitee consists of a bunch of
retards invalidating completely fine code and requesting super
idiotic work arounds for their new versions. I have no fucking idea
why these spaces are required and honestly I don't even want to know.
Whatever the reason it should now compile fine with C++11 until the^
next C++ version will probably invalidate it again. To a better
future I can't wait.
2016-06-14 22:45:58 +02:00
Chris Willcocks
f53e2d51d8 path fix 2016-06-14 16:18:38 +01:00
vurtun
110a9a77fb Made reading out moved/scaled group bounds easier
Previously if you used movable or scalable groups you had to add
the group border width to the panel to access the updated position
or size. Nuklear now takes control of the process and the new
position/size can be read after `nk_group_end` from `nk_panel`
directly.
2016-06-14 12:35:03 +02:00
vurtun
c152abb78c Changed toggle to be font height dependent
Extended toggle style and changed toggle (checkbox + radio button) to
depend on the font height instead of row height. The main reason is
that it is easier to configure the cursor inside.
2016-06-14 12:22:05 +02:00
vurtun
8ed50e08d4 Fixed configuration of group border color
This commit adds a previously missing `group` flag to each group panel
and therefore allows to check for groups inside `nk_panel_end` and
draw the correct border color.
2016-06-14 09:49:09 +02:00
vurtun
ea4ac755de Fixed group/node movement and scaling
Fixed a small bug introduced by the last commit which prevent
groups from being moved. In addition I fixed an old scaling bug for
groups. It should now be possible to have movable and scalable
groups.
2016-06-13 20:02:44 +02:00
Chris Willcocks
5d440b565b Emscripten support with glfw3 (and shaders) with changes to nuklear_glfw_gl3.h - demo at www.cwkx.com/nuklear/ 2016-06-13 16:38:32 +01:00
vurtun
a299b46b6d Updated Readme 2016-06-12 16:14:24 +02:00
vurtun
d57fce9b85 Added missing label text color 2016-06-12 15:48:47 +02:00