From b50b6bf45e67de09b1127087642046b2f253e30d Mon Sep 17 00:00:00 2001 From: Alec Murphy Date: Fri, 9 May 2025 13:54:04 -0400 Subject: [PATCH] System/Libraries/Html/Reflow+Renderer: Add reflow_win to HtmlRenderer --- System/Libraries/Html/Reflow.HC | 4 ++-- System/Libraries/Html/Renderer.HC | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/System/Libraries/Html/Reflow.HC b/System/Libraries/Html/Reflow.HC index 24db646..9468b44 100644 --- a/System/Libraries/Html/Reflow.HC +++ b/System/Libraries/Html/Reflow.HC @@ -369,7 +369,7 @@ U0 @reflow_set_initial_values(HtmlRenderer* renderer) renderer->reflow.bounds.x1 = 0; renderer->reflow.bounds.x2 = renderer->background_widget->width; renderer->reflow.bounds.y1 = 0; - renderer->reflow.bounds.y2 = renderer->win->height; + renderer->reflow.bounds.y2 = renderer->reflow_win->height; renderer->reflow.inline.x = 0; renderer->reflow.inline.y = 0; renderer->reflow.inline.max_line_height = RENDERER_DEFAULT_MAX_LINE_HEIGHT; @@ -831,7 +831,7 @@ U0 @reflow_set_hyperlink_if_needed(Widget* widget, HtmlRenderer* renderer) U0 @reflow_node_list(HtmlRenderer* renderer) { - if (!renderer || !renderer->win || !renderer->widgets_base) + if (!renderer || !renderer->win || !renderer->reflow_win || !renderer->widgets_base) return; //"Reflow begin\n"; diff --git a/System/Libraries/Html/Renderer.HC b/System/Libraries/Html/Renderer.HC index 32bb86b..12db3ac 100644 --- a/System/Libraries/Html/Renderer.HC +++ b/System/Libraries/Html/Renderer.HC @@ -97,6 +97,7 @@ class @html_renderer RectWidget* background_widget; U32 background_color; Window* win; + Window* reflow_win; @window_widgets_list* widgets_base; @window_widgets_list* images; I64 inline_x; @@ -1760,7 +1761,6 @@ U0 @apply_attribute_values_to_node(@html_dom_node* node) U0 @set_background_color_for_page(@html_dom_node* node, HtmlRenderer* renderer) { renderer->background_color = node->backgroundColor; - renderer->background_widget->color = renderer->background_color; } U0 @handle_tag_specific_functions(@html_dom_node* node, HtmlRenderer* renderer)