TheCloud/nuklear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed group/node movement and scaling

Browse Source 
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.
This commit is contained in:
vurtun 2016-06-13 19:50:45 +02:00
parent a299b46b6d
commit ea4ac755de
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nuklear.h
View File

@ -2334,11 +2334,6 @@ struct nk_property_state {
int state; int state;
}; };
struct nk_scaling_state {
struct nk_vec2 start_size;
int active;
};
struct nk_window { struct nk_window {
unsigned int seq; unsigned int seq;
nk_hash name; nk_hash name;
@ -2352,7 +2347,6 @@ struct nk_window {
struct nk_property_state property; struct nk_property_state property;
struct nk_popup_state popup; struct nk_popup_state popup;
struct nk_edit_state edit; struct nk_edit_state edit;
struct nk_scaling_state scaling;
struct nk_table *tables; struct nk_table *tables;
unsigned short table_count; unsigned short table_count;
@ -15500,7 +15494,7 @@ nk_panel_begin(struct nk_context *ctx, const char *title)
#endif #endif
/* window dragging */ /* window dragging */
if ((win->flags & NK_WINDOW_MOVABLE) && ctx->active == win) { if ((win->flags & NK_WINDOW_MOVABLE) && !(win->flags & NK_WINDOW_ROM)) {
int left_mouse_down; int left_mouse_down;
int left_mouse_click_in_cursor; int left_mouse_click_in_cursor;
@ -15979,28 +15973,19 @@ nk_panel_end(struct nk_context *ctx)
/* do window scaling */ /* do window scaling */
if (!(window->flags & NK_WINDOW_ROM)) { if (!(window->flags & NK_WINDOW_ROM)) {
struct nk_vec2 delta;
float prev_x = in->mouse.prev.x; float prev_x = in->mouse.prev.x;
float prev_y = in->mouse.prev.y; float prev_y = in->mouse.prev.y;
struct nk_vec2 window_size = style->window.min_size; struct nk_vec2 window_size = style->window.min_size;
int incursor = NK_INBOX(prev_x,prev_y,scaler_x,scaler_y,scaler_w,scaler_h); int incursor = NK_INBOX(prev_x,prev_y,scaler_x,scaler_y,scaler_w,scaler_h);
if (nk_input_is_mouse_down(in, NK_BUTTON_LEFT) && if (nk_input_is_mouse_down(in, NK_BUTTON_LEFT) && incursor) {
(incursor || window->scaling.active == nk_true)) window->bounds.w = NK_MAX(window_size.x, window->bounds.w + in->mouse.delta.x);
{
if(window->scaling.active == nk_false)
window->scaling.start_size = nk_rect_size(window->bounds);
window->scaling.active = nk_true;
if (!in || !in->mouse.buttons[NK_BUTTON_LEFT].down)
delta = nk_vec2(0,0);
else delta = nk_vec2_sub(in->mouse.pos, in->mouse.buttons[NK_BUTTON_LEFT].clicked_pos);
window->bounds.w = NK_MAX(window_size.x, window->scaling.start_size.x + delta.x);
/* dragging in y-direction is only possible if static window */ /* dragging in y-direction is only possible if static window */
if (!(layout->flags & NK_WINDOW_DYNAMIC)) if (!(layout->flags & NK_WINDOW_DYNAMIC))
window->bounds.h = NK_MAX(window->scaling.start_size.y + delta.y, window_size.y); window->bounds.h = NK_MAX(window_size.y, window->bounds.h + in->mouse.delta.y);
} else window->scaling.active = nk_false; /* this save the update bounds for scalable groups */
window->layout->bounds = window->bounds;
}
} }
} }
@ -18109,7 +18094,6 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
struct nk_panel *layout = win->layout; struct nk_panel *layout = win->layout;
const struct nk_input *i = &ctx->input; const struct nk_input *i = &ctx->input;
struct nk_command_buffer *out = &win->buffer; struct nk_command_buffer *out = &win->buffer;
struct nk_style_chart *style;
nk_flags ret = 0; nk_flags ret = 0;
struct nk_vec2 cur; struct nk_vec2 cur;
@ -18123,7 +18107,6 @@ nk_chart_push_line(struct nk_context *ctx, struct nk_window *win,
step = g->w / (float)g->slots[slot].count; step = g->w / (float)g->slots[slot].count;
range = g->slots[slot].max - g->slots[slot].min; range = g->slots[slot].max - g->slots[slot].min;
ratio = (value - g->slots[slot].min) / range; ratio = (value - g->slots[slot].min) / range;
style = &ctx->style.chart;
if (g->slots[slot].index == 0) { if (g->slots[slot].index == 0) {
/* first data point does not have a connection */ /* first data point does not have a connection */
@ -18184,7 +18167,6 @@ nk_chart_push_column(const struct nk_context *ctx, struct nk_window *win,
struct nk_command_buffer *out = &win->buffer; struct nk_command_buffer *out = &win->buffer;
const struct nk_input *in = &ctx->input; const struct nk_input *in = &ctx->input;
struct nk_panel *layout = win->layout; struct nk_panel *layout = win->layout;
const struct nk_style_chart *style;
float ratio; float ratio;
nk_flags ret = 0; nk_flags ret = 0;
@ -18200,7 +18182,6 @@ nk_chart_push_column(const struct nk_context *ctx, struct nk_window *win,
} }
/* calculate bounds of current bar chart entry */ /* calculate bounds of current bar chart entry */
style = &ctx->style.chart;
color = chart->slots[slot].color;; color = chart->slots[slot].color;;
item.h = chart->h * NK_ABS((value/chart->slots[slot].range)); item.h = chart->h * NK_ABS((value/chart->slots[slot].range));
if (value >= 0) { if (value >= 0) {