Skip to content

Commit ff26938

Browse files
RobLoachRobLoach
committed
Follow up on checkbox
1 parent 01d8c86 commit ff26938

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

‎nuklear.h

+11-9
Original file line numberDiff line numberDiff line change
@@ -18669,10 +18669,10 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
1866918669
toggle->text_normal = table[NK_COLOR_TEXT];
1867018670
toggle->text_hover = table[NK_COLOR_TEXT];
1867118671
toggle->text_active = table[NK_COLOR_TEXT];
18672-
toggle->padding = nk_vec2(2.0f, 2.0f);
18672+
toggle->padding = nk_vec2(1.0f, 1.0f);
1867318673
toggle->touch_padding = nk_vec2(0,0);
1867418674
toggle->border_color = nk_rgba(0,0,0,0);
18675-
toggle->border = 0.0f;
18675+
toggle->border = 1.0f;
1867618676
toggle->spacing = 4;
1867718677
toggle->color_factor = 1.0f;
1867818678
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
@@ -18690,10 +18690,10 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
1869018690
toggle->text_normal = table[NK_COLOR_TEXT];
1869118691
toggle->text_hover = table[NK_COLOR_TEXT];
1869218692
toggle->text_active = table[NK_COLOR_TEXT];
18693-
toggle->padding = nk_vec2(3.0f, 3.0f);
18693+
toggle->padding = nk_vec2(1.0f, 1.0f);
1869418694
toggle->touch_padding = nk_vec2(0,0);
1869518695
toggle->border_color = nk_rgba(0,0,0,0);
18696-
toggle->border = 0.0f;
18696+
toggle->border = 1.0f;
1869718697
toggle->spacing = 4;
1869818698
toggle->color_factor = 1.0f;
1869918699
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
@@ -25070,18 +25070,18 @@ nk_draw_checkbox(struct nk_command_buffer *out,
2507025070
text.padding.y = 0;
2507125071
text.background = style->text_background;
2507225072
nk_widget_text(out, *label, string, len, &text, text_alignment, font);
25073-
25073+
2507425074
/* draw background and cursor */
2507525075
if (background->type == NK_STYLE_ITEM_COLOR) {
25076-
nk_stroke_rect(out, *selector, 2, 2, nk_rgb_factor(background->data.color, style->color_factor));
25076+
nk_stroke_rect(out, *selector, 0, style->border, nk_rgb_factor(background->data.color, style->color_factor));
2507725077
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
25078+
25079+
/* active state */
2507825080
if (active) {
2507925081
if (cursor->type == NK_STYLE_ITEM_IMAGE)
2508025082
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
2508125083
else nk_fill_rect(out, *cursors, 0, nk_rgb_factor(background->data.color, style->color_factor));
2508225084
}
25083-
25084-
2508525085
}
2508625086
NK_LIB void
2508725087
nk_draw_option(struct nk_command_buffer *out,
@@ -25117,8 +25117,10 @@ nk_draw_option(struct nk_command_buffer *out,
2511725117

2511825118
/* draw background and cursor */
2511925119
if (background->type == NK_STYLE_ITEM_COLOR) {
25120-
nk_stroke_circle(out, *selector, 2, nk_rgb_factor(background->data.color, style->color_factor));
25120+
nk_stroke_circle(out, *selector, style->border, nk_rgb_factor(background->data.color, style->color_factor));
2512125121
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
25122+
25123+
/* active state */
2512225124
if (active) {
2512325125
if (cursor->type == NK_STYLE_ITEM_IMAGE)
2512425126
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));

‎src/nuklear_style.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
204204
toggle->text_normal = table[NK_COLOR_TEXT];
205205
toggle->text_hover = table[NK_COLOR_TEXT];
206206
toggle->text_active = table[NK_COLOR_TEXT];
207-
toggle->padding = nk_vec2(2.0f, 2.0f);
207+
toggle->padding = nk_vec2(1.0f, 1.0f);
208208
toggle->touch_padding = nk_vec2(0,0);
209209
toggle->border_color = nk_rgba(0,0,0,0);
210-
toggle->border = 0.0f;
210+
toggle->border = 1.0f;
211211
toggle->spacing = 4;
212212
toggle->color_factor = 1.0f;
213213
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
@@ -225,10 +225,10 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
225225
toggle->text_normal = table[NK_COLOR_TEXT];
226226
toggle->text_hover = table[NK_COLOR_TEXT];
227227
toggle->text_active = table[NK_COLOR_TEXT];
228-
toggle->padding = nk_vec2(3.0f, 3.0f);
228+
toggle->padding = nk_vec2(1.0f, 1.0f);
229229
toggle->touch_padding = nk_vec2(0,0);
230230
toggle->border_color = nk_rgba(0,0,0,0);
231-
toggle->border = 0.0f;
231+
toggle->border = 1.0f;
232232
toggle->spacing = 4;
233233
toggle->color_factor = 1.0f;
234234
toggle->disabled_factor = NK_WIDGET_DISABLED_FACTOR;

‎src/nuklear_toggle.c

+8-12
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ nk_draw_checkbox(struct nk_command_buffer *out,
3131
const struct nk_style_item *background;
3232
const struct nk_style_item *cursor;
3333
struct nk_text text;
34-
struct nk_rect toggle_active_box = *cursors;
35-
toggle_active_box.x += 1;
36-
toggle_active_box.y += 1;
37-
toggle_active_box.w -= 2;
38-
toggle_active_box.h -= 2;
39-
4034

4135
/* select correct colors/images */
4236
if (state & NK_WIDGET_STATE_HOVER) {
@@ -58,18 +52,18 @@ nk_draw_checkbox(struct nk_command_buffer *out,
5852
text.padding.y = 0;
5953
text.background = style->text_background;
6054
nk_widget_text(out, *label, string, len, &text, text_alignment, font);
61-
55+
6256
/* draw background and cursor */
6357
if (background->type == NK_STYLE_ITEM_COLOR) {
64-
nk_stroke_rect(out, *selector, 2, 0, nk_rgb_factor(background->data.color, style->color_factor));
58+
nk_stroke_rect(out, *selector, 0, style->border, nk_rgb_factor(background->data.color, style->color_factor));
6559
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
60+
61+
/* active state */
6662
if (active) {
6763
if (cursor->type == NK_STYLE_ITEM_IMAGE)
6864
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));
69-
else nk_fill_rect(out, toggle_active_box, 0, nk_rgb_factor(background->data.color, style->color_factor));
65+
else nk_fill_rect(out, *cursors, 0, nk_rgb_factor(background->data.color, style->color_factor));
7066
}
71-
72-
7367
}
7468
NK_LIB void
7569
nk_draw_option(struct nk_command_buffer *out,
@@ -105,8 +99,10 @@ nk_draw_option(struct nk_command_buffer *out,
10599

106100
/* draw background and cursor */
107101
if (background->type == NK_STYLE_ITEM_COLOR) {
108-
nk_stroke_circle(out, *selector, 2, nk_rgb_factor(background->data.color, style->color_factor));
102+
nk_stroke_circle(out, *selector, style->border, nk_rgb_factor(background->data.color, style->color_factor));
109103
} else nk_draw_image(out, *selector, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
104+
105+
/* active state */
110106
if (active) {
111107
if (cursor->type == NK_STYLE_ITEM_IMAGE)
112108
nk_draw_image(out, *cursors, &cursor->data.image, nk_rgb_factor(nk_white, style->color_factor));

0 commit comments

Comments
 (0)