From 6232873c49f95036902050b635e716d2e7b5c1dc Mon Sep 17 00:00:00 2001 From: Alec Murphy Date: Tue, 25 Mar 2025 11:24:29 -0400 Subject: [PATCH] Everywhere: Use ctx->fill() --- Applications/OS/MenuBar.app/Run.HC | 5 +++-- Applications/OS/TaskSwitcher.app/Run.HC | 6 +++--- Applications/OS/Terminal.app/Run.HC | 4 ++-- Media/Themes/Umami/Theme.HC | 2 +- System/Core/Compositor.HC | 2 +- System/Core/SystemTray.HC | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Applications/OS/MenuBar.app/Run.HC b/Applications/OS/MenuBar.app/Run.HC index f828131..5ca4831 100644 --- a/Applications/OS/MenuBar.app/Run.HC +++ b/Applications/OS/MenuBar.app/Run.HC @@ -58,8 +58,9 @@ U0 @system_menu_show(Context2DWidget* widget) { sys_menu->x = 0; sys_menu->y = 32; - if (widget->width == 30 && widget->height == 30) - Fill2D(widget->ctx, Color(192, 192, 192)); + if (widget->width == 30 && widget->height == 30) { + widget->ctx->fill(Color(192, 192, 192)); + } Gui.Window.Show(sys_menu); Gui.Window.SetFocus(sys_menu); Gui.Window.Refresh(sys_menu); diff --git a/Applications/OS/TaskSwitcher.app/Run.HC b/Applications/OS/TaskSwitcher.app/Run.HC index 10453ed..da20857 100644 --- a/Applications/OS/TaskSwitcher.app/Run.HC +++ b/Applications/OS/TaskSwitcher.app/Run.HC @@ -90,7 +90,7 @@ U0 @taskswitcher_render_win_thumbs(Window* win) cursor = Gui.CreateWidget(win, WIDGET_TYPE_CONTEXT2D, -999, -999, win_thumb_container_size, win_thumb_container_size); cursor->ctx = NewContext2D(win_thumb_container_size, win_thumb_container_size); - Fill2D(cursor->ctx, Compositor.theme.color.hilight); + cursor->ctx->fill(Compositor.theme.color.hilight); I64 min_caption_width = 0; win_items = 0; @@ -129,13 +129,13 @@ U0 @taskswitcher_render_win_thumbs(Window* win) (win_thumb_container_size * cur_item) + item_offset, 0, win_thumb_container_size, win_thumb_container_size); widget->ctx = NewContext2D(win_thumb_container_size, win_thumb_container_size); - Fill2D(widget->ctx, NULL); + widget->ctx->fill(0); win_scale = 1.0; while (iter_list->window->backing_store->width * win_scale > win_thumb_size || iter_list->window->backing_store->height * win_scale > win_thumb_size) win_scale -= 0.001; win_scaled = Scale2D(iter_list->window->backing_store, win_scale, win_scale); - Fill2D(widget->ctx, NULL); + widget->ctx->fill(0); Blot2D(widget->ctx, (win_thumb_container_size / 2) - (win_scaled->width / 2), (win_thumb_container_size / 2) - (win_scaled->height / 2), diff --git a/Applications/OS/Terminal.app/Run.HC b/Applications/OS/Terminal.app/Run.HC index 177b111..30e25f5 100644 --- a/Applications/OS/Terminal.app/Run.HC +++ b/Applications/OS/Terminal.app/Run.HC @@ -109,13 +109,13 @@ VerticalScrollBarWidget* vscroll = Gui.CreateWidget(win, WIDGET_TYPE_VERT_SCROLL vscroll->height = 128; Context2DWidget* status = Gui.CreateWidget(win, WIDGET_TYPE_CONTEXT2D, 0, 0, Display.Width(), 44); status->ctx = NewContext2D(Display.Width(), 44); -Fill2D(status->ctx, Color(204, 204, 204, win->opacity)); +status->ctx->fill(Color(204, 204, 204, win->opacity)); U0 @terminal_create_new_instance() { U32 init_bg_color = t->color.background; init_bg_color.u8[3] = win->opacity; - Fill2D(t->backing_store, init_bg_color); + t->backing_store->fill(init_bg_color); active_term = t; sh = @shell_new; sh->session = &Compositor.session; diff --git a/Media/Themes/Umami/Theme.HC b/Media/Themes/Umami/Theme.HC index ce3eadb..e95e0f7 100644 --- a/Media/Themes/Umami/Theme.HC +++ b/Media/Themes/Umami/Theme.HC @@ -749,7 +749,7 @@ I64 @umami_input_get_text_width(BitmapFontTextInputWidget* widget) I64 text_width = PutS2D(NULL, widget->font, 0, 0, Color(0, 0, 0), -1, &widget->text); Context2D* ctx = NewContext2D(text_width, widget->font->line_height); - Fill2D(ctx, 0); + ctx->fill(0); PutS2D(ctx, widget->font, 0, 0, Color(128, 255, 255), -1, &widget->text); for (x = ctx->width - 1; x > -1; x--) { diff --git a/System/Core/Compositor.HC b/System/Core/Compositor.HC index 1a3da84..1345b9e 100644 --- a/System/Core/Compositor.HC +++ b/System/Core/Compositor.HC @@ -194,7 +194,7 @@ U0 @compositor_set_wallpaper(Context2D* ctx, U32 mode, U32 background) switch (mode) { case CPZ_WALLPAPER_CENTERED: tmp = NewContext2D(Display.Width(), Display.Height()); - Fill2D(tmp, background); + tmp->fill(background); CopyRect2D(tmp, (Display.Width() / 2) - (ctx->width / 2), (Display.Height() / 2) - (ctx->height / 2), diff --git a/System/Core/SystemTray.HC b/System/Core/SystemTray.HC index db7c7e6..aff0168 100644 --- a/System/Core/SystemTray.HC +++ b/System/Core/SystemTray.HC @@ -20,7 +20,7 @@ U0 @systemtray_register_item(I64 addr) Context2DWidget* item = Gui.CreateWidget( Compositor.menubar.win, WIDGET_TYPE_CONTEXT2D, -24, 0, 24, 24); item->ctx = NewContext2D(item->width, item->height); - Fill2D(item->ctx, Color(0, 0, 0, 0)); + item->ctx->fill(0); MemSetI64(addr, item, 1); }