|
@@ -1054,8 +1054,10 @@ static void draw_status_card(struct ngui_rect r)
|
|
|
else
|
|
else
|
|
|
dot_color = ui.theme.success;
|
|
dot_color = ui.theme.success;
|
|
|
|
|
|
|
|
- ngui_fill_round_rect(&ui, r, 8, 8, 8, 8, ui.theme.panel);
|
|
|
|
|
- ngui_frame_round(&ui, r, 8, 8, 8, 8, 1, ui.theme.panel_alt);
|
|
|
|
|
|
|
+ ngui_fill_round_rect(&ui, r, NGUI_RADIUS, NGUI_RADIUS,
|
|
|
|
|
+ NGUI_RADIUS, NGUI_RADIUS, ui.theme.panel);
|
|
|
|
|
+ ngui_frame_round(&ui, r, NGUI_RADIUS, NGUI_RADIUS,
|
|
|
|
|
+ NGUI_RADIUS, NGUI_RADIUS, 1, ui.theme.panel_alt);
|
|
|
ngui_fill_round_rect(&ui, dot, 5, 5, 5, 5, dot_color);
|
|
ngui_fill_round_rect(&ui, dot, 5, 5, 5, 5, dot_color);
|
|
|
|
|
|
|
|
p = line;
|
|
p = line;
|
|
@@ -1208,7 +1210,8 @@ static void draw_summary(struct ngui_rect r)
|
|
|
dot = ui.theme.warning;
|
|
dot = ui.theme.warning;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- ngui_fill_round_rect(&ui, r, 10, 10, 10, 10, ui.theme.panel);
|
|
|
|
|
|
|
+ ngui_fill_round_rect(&ui, r, NGUI_RADIUS, NGUI_RADIUS,
|
|
|
|
|
+ NGUI_RADIUS, NGUI_RADIUS, ui.theme.panel);
|
|
|
ngui_fill_round_rect(&ui,
|
|
ngui_fill_round_rect(&ui,
|
|
|
(struct ngui_rect){ r.x + 14, r.y + 23, 10, 10 },
|
|
(struct ngui_rect){ r.x + 14, r.y + 23, 10, 10 },
|
|
|
5, 5, 5, 5, dot);
|
|
5, 5, 5, 5, dot);
|
|
@@ -1245,7 +1248,8 @@ static void draw_brightness(struct ngui_rect r)
|
|
|
int v = brightness;
|
|
int v = brightness;
|
|
|
int tw;
|
|
int tw;
|
|
|
|
|
|
|
|
- ngui_fill_round_rect(&ui, r, 10, 10, 10, 10, ui.theme.panel);
|
|
|
|
|
|
|
+ ngui_fill_round_rect(&ui, r, NGUI_RADIUS, NGUI_RADIUS,
|
|
|
|
|
+ NGUI_RADIUS, NGUI_RADIUS, ui.theme.panel);
|
|
|
ngui_text_px(&ui, r.x + 14, r.y + 6, "Brightness", 10,
|
|
ngui_text_px(&ui, r.x + 14, r.y + 6, "Brightness", 10,
|
|
|
ui.theme.text, 14, 1, 0, 0);
|
|
ui.theme.text, 14, 1, 0, 0);
|
|
|
p = put_dec(b, (unsigned int)(v < 0 ? 0 : v));
|
|
p = put_dec(b, (unsigned int)(v < 0 ? 0 : v));
|
|
@@ -1853,7 +1857,8 @@ static void draw_connect(void)
|
|
|
* the popover footer. */
|
|
* the popover footer. */
|
|
|
log = body;
|
|
log = body;
|
|
|
log.h -= 38;
|
|
log.h -= 38;
|
|
|
- ngui_fill_round_rect(&ui, log, 6, 6, 6, 6, ui.theme.panel);
|
|
|
|
|
|
|
+ ngui_fill_round_rect(&ui, log, NGUI_RADIUS, NGUI_RADIUS,
|
|
|
|
|
+ NGUI_RADIUS, NGUI_RADIUS, ui.theme.panel);
|
|
|
ngui_push_clip(&ui, (struct ngui_rect){ log.x + 8, log.y + 8,
|
|
ngui_push_clip(&ui, (struct ngui_rect){ log.x + 8, log.y + 8,
|
|
|
log.w - 16, log.h - 16 });
|
|
log.w - 16, log.h - 16 });
|
|
|
|
|
|