Skip to content

Commit

Permalink
Fix CI builds
Browse files Browse the repository at this point in the history
  • Loading branch information
cxong committed Dec 19, 2019
1 parent a029ace commit 3296740
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ deploy:
tags: true
condition: $CC = gcc

after_deploy
after_deploy:
- bash build/travis-ci/butler.sh
2 changes: 1 addition & 1 deletion .travis.yml.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ deploy:
tags: true
condition: $CC = gcc

after_deploy
after_deploy:
- bash build/travis-ci/butler.sh
5 changes: 1 addition & 4 deletions src/nuklear/nuklear.h
Original file line number Diff line number Diff line change
Expand Up @@ -18550,7 +18550,6 @@ nk_tree_element_image_push_hashed_base(struct nk_context *ctx, enum nk_tree_type
struct nk_vec2 item_spacing;
struct nk_rect header = {0,0,0,0};
struct nk_rect sym = {0,0,0,0};
struct nk_text text;

nk_flags ws = 0;
enum nk_widget_layout_states widget_state;
Expand Down Expand Up @@ -18580,14 +18579,12 @@ nk_tree_element_image_push_hashed_base(struct nk_context *ctx, enum nk_tree_type
const struct nk_style_item *background = &style->tab.background;
if (background->type == NK_STYLE_ITEM_IMAGE) {
nk_draw_image(out, header, &background->data.image, nk_white);
text.background = nk_rgba(0,0,0,0);
} else {
text.background = background->data.color;
nk_fill_rect(out, header, 0, style->tab.border_color);
nk_fill_rect(out, nk_shrink_rect(header, style->tab.border),
style->tab.rounding, background->data.color);
}
} else text.background = style->window.background;
}

in = (!(layout->flags & NK_WINDOW_ROM)) ? &ctx->input: 0;
in = (in && widget_state == NK_WIDGET_VALID) ? &ctx->input : 0;
Expand Down

0 comments on commit 3296740

Please sign in to comment.