diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-11-05 12:50:08 +0100 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2016-11-05 12:50:08 +0100 |
| commit | babeddd5874d4bd4f89f8995dbfff8d9b94af9cc (patch) | |
| tree | 0ff85a1957447d239f904902edd51a96aec66141 | |
| parent | ae914e4c6072a468792a6f93f0b8875f9be94c45 (diff) | |
| download | sherlock.lv2-babeddd5874d4bd4f89f8995dbfff8d9b94af9cc.tar.xz | |
nk: count events instead of sequences.
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | atom_inspector_nk.c | 7 | ||||
| -rw-r--r-- | midi_inspector_nk.c | 5 | ||||
| -rw-r--r-- | osc_inspector_nk.c | 6 | ||||
| -rw-r--r-- | sherlock_nk.c | 1 |
5 files changed, 12 insertions, 9 deletions
@@ -1 +1 @@ -0.11.39 +0.11.41 diff --git a/atom_inspector_nk.c b/atom_inspector_nk.c index 5b92f20..b143561 100644 --- a/atom_inspector_nk.c +++ b/atom_inspector_nk.c @@ -198,6 +198,7 @@ _atom_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *dat nk_layout_row_end(ctx); last = body; + counter += 1; } if(handle->bottom) @@ -205,10 +206,10 @@ _atom_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *dat ttl_dirty = true; handle->selected = last; } - - counter += 1; } + handle->count = counter; + const struct nk_panel *panel = nk_window_get_panel(ctx); if(handle->bottom) { @@ -255,7 +256,7 @@ _atom_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *dat } nk_layout_row_dynamic(ctx, wbounds.h, 1); - const nk_flags flags = NK_EDIT_EDITOR | NK_EDIT_READ_ONLY; + const nk_flags flags = NK_EDIT_EDITOR; const nk_flags mode = nk_edit_buffer(ctx, flags, &handle->edit, nk_filter_default); (void)mode; diff --git a/midi_inspector_nk.c b/midi_inspector_nk.c index a0548f3..df39f30 100644 --- a/midi_inspector_nk.c +++ b/midi_inspector_nk.c @@ -475,11 +475,12 @@ _midi_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *dat _empty(ctx); } } + counter += 1; } - - counter += 1; } + handle->count = counter; + const struct nk_panel *panel = nk_window_get_panel(ctx); if(handle->bottom) { diff --git a/osc_inspector_nk.c b/osc_inspector_nk.c index f72376a..cbfb1c9 100644 --- a/osc_inspector_nk.c +++ b/osc_inspector_nk.c @@ -369,11 +369,13 @@ _osc_inspector_expose(struct nk_context *ctx, struct nk_rect wbounds, void *data nk_labelf_colored(ctx, NK_TEXT_LEFT, yellow, "+%04"PRIi64, frames); _osc_packet(handle, ctx, obj, off); - } - counter += 1; + counter += 1; + } } + handle->count = counter; + const struct nk_panel *panel = nk_window_get_panel(ctx); if(handle->bottom) { diff --git a/sherlock_nk.c b/sherlock_nk.c index 76685c0..852bc20 100644 --- a/sherlock_nk.c +++ b/sherlock_nk.c @@ -372,7 +372,6 @@ port_event(LV2UI_Handle instance, uint32_t i, uint32_t size, uint32_t urid, const uint32_t sz = lv2_atom_total_size(atom); lv2_atom_forge_write(&handle->mem, atom, sz); - handle->count += 1; if(handle->state.follow) handle->bottom = true; // signal scrolling to bottom |