Skip to content
This repository was archived by the owner on Dec 2, 2019. It is now read-only.

Modify the appearance for option and checkbox! #653

Open
zhouxs1023 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify the appearance for option and checkbox! #653

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions nuklear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15838,13 +15838,12 @@ nk_draw_checkbox(struct nk_command_buffer *out,

/* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) {
nk_fill_rect(out, *selector, 0, style->border_color);
nk_fill_rect(out, nk_shrink_rect(*selector, style->border), 0, background->data.color);
nk_stroke_rect(out, *selector, 2, 2, background->data.color);
Copy link
Contributor

@dumblob dumblob Mar 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a total nitpicking, but this indentation is not correct 😉.

Copy link
Author

@zhouxs1023 zhouxs1023 Mar 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have looked at the codes ,It are correct! I had updated pics!

Copy link
Contributor

@dumblob dumblob Mar 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The picture is totally fine. It's just, that this line is indented with tabs, but shall be indented with spaces. Otherwise I think this commit can get merged.

} else nk_draw_image(out, *selector, &background->data.image, nk_white);
if (active) {
if (cursor->type == NK_STYLE_ITEM_IMAGE)
nk_draw_image(out, *cursors, &cursor->data.image, nk_white);
else nk_fill_rect(out, *cursors, 0, cursor->data.color);
else nk_fill_rect(out, *cursors, 0, background->data.color);
}

text.padding.x = 0;
Expand Down Expand Up @@ -15881,13 +15880,12 @@ nk_draw_option(struct nk_command_buffer *out,

/* draw background and cursor */
if (background->type == NK_STYLE_ITEM_COLOR) {
nk_fill_circle(out, *selector, style->border_color);
nk_fill_circle(out, nk_shrink_rect(*selector, style->border), background->data.color);
nk_stroke_circle(out, *selector, 2, background->data.color);
} else nk_draw_image(out, *selector, &background->data.image, nk_white);
if (active) {
if (cursor->type == NK_STYLE_ITEM_IMAGE)
nk_draw_image(out, *cursors, &cursor->data.image, nk_white);
else nk_fill_circle(out, *cursors, cursor->data.color);
else nk_fill_circle(out, *cursors, background->data.color);
}

text.padding.x = 0;
Expand Down