Skip to content

Commit 229550a

Browse files
committed
fix: screenshot icon, terminal
1 parent 9fd7195 commit 229550a

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

ZenOS.vhd

0 Bytes
Binary file not shown.

userland/files/harp/harp_draw.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#define C_CLOCK 0xFFAAAAAA
7777
#define C_DRAG 0xFF3A3A3A
7878
#define C_WHITE 0xFFFFFFFF
79-
#define C_SHOT 0xFF646B76
79+
#define C_SHOT 0x0F0F0F0F
8080
#define TILE_ALPHA 120
8181

8282
static uint32_t *s_backbuf;
@@ -271,14 +271,18 @@ static void draw_x(int cx, int cy, int sz, uint32_t c)
271271

272272
static void draw_plus_icon(int x, int y, int sz)
273273
{
274-
int arm = sz / 3;
274+
int arm = sz / 3 + 2;
275275
int thick = sz / 7;
276276
if (thick < 2) thick = 2;
277+
if (!(arm % 2)) arm++;
278+
if (!(thick % 2)) thick++;
279+
277280
int cx = x + sz / 2;
278281
int cy = y + sz / 2;
282+
279283
bb_rrect_alpha(x, y, sz, sz, LAUNCH_R, C_SHOT, 208);
280-
bb_rect(cx - thick / 2, y + (sz - arm) / 2, thick, arm, C_WHITE);
281-
bb_rect(x + (sz - arm) / 2, cy - thick / 2, arm, thick, C_WHITE);
284+
bb_rect(cx - thick/2, cy - arm/2, thick, arm, C_WHITE);
285+
bb_rect(cx - arm/2, cy - thick/2, arm, thick, C_WHITE);
282286
}
283287

284288
void bb_text(int x, int y, uint32_t fg, uint32_t bg, const char *str)

userland/files/terminal/terminal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ int main(void)
808808
int did_work = 0;
809809
if (avail > 0) { drain_master(); did_work = 1; }
810810
if (pump_window_events()) did_work = 1;
811-
while (!did_work)
811+
if (!did_work)
812812
sched_yield();
813813
}
814814
}

0 commit comments

Comments
 (0)