RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:28:12 +00:00
Code Issues Activity Actions

LibWeb: Support appearance: none for <progress> elements

Browse source 
This disables this system progress bar, and instead creates one
out of pseudo elements, that can be selected and styled with the
::-webkit-progress-bar/value selectors.
This commit is contained in:
MacDue 2022-07-22 16:08:03 +01:00 • committed by Andreas Kling
parent d7d34d88e5
commit 57c6792458
3 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Userland/Libraries/LibWeb/HTML/HTMLProgressElement.cpp
View file

@ -1,10 +1,15 @@
/*
* Copyright (c) 2020-2022, the SerenityOS developers.
* Copyright (c) 2022, MacDue <macdue@dueutil.tech>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/ShadowRoot.h>
#include <LibWeb/HTML/HTMLProgressElement.h>
#include <LibWeb/Layout/BlockContainer.h>
#include <LibWeb/Layout/Node.h>
#include <LibWeb/Layout/Progress.h>
#include <stdlib.h>
@ -19,7 +24,29 @@ HTMLProgressElement::~HTMLProgressElement() = default;
RefPtr<Layout::Node> HTMLProgressElement::create_layout_node(NonnullRefPtr<CSS::StyleProperties> style)
{
return adopt_ref(*new Layout::Progress(document(), *this, move(style)));
RefPtr<Layout::Node> layout_node;
if (style->appearance().value_or(CSS::Appearance::Auto) == CSS::Appearance::None) {
layout_node = adopt_ref(*new Layout::BlockContainer(document(), this, move(style)));
layout_node->set_inline(true);
} else {
layout_node = adopt_ref(*new Layout::Progress(document(), *this, move(style)));
}
return layout_node;
}
bool HTMLProgressElement::using_system_appearance() const
{
if (layout_node())
return is<Layout::Progress>(*layout_node());
return false;
}
void HTMLProgressElement::progress_position_updated()
{
if (using_system_appearance())
layout_node()->set_needs_display();
else
document().invalidate_layout();
}
double HTMLProgressElement::value() const
@ -41,9 +68,7 @@ void HTMLProgressElement::set_value(double value)
return;
set_attribute(HTML::AttributeNames::value, String::number(value));
if (layout_node())
layout_node()->set_needs_display();
progress_position_updated();
}
double HTMLProgressElement::max() const
@ -65,9 +90,7 @@ void HTMLProgressElement::set_max(double value)
return;
set_attribute(HTML::AttributeNames::max, String::number(value));
if (layout_node())
layout_node()->set_needs_display();
progress_position_updated();
}
double HTMLProgressElement::position() const

4
Userland/Libraries/LibWeb/HTML/HTMLProgressElement.h
View file

@ -31,7 +31,11 @@ public:
// https://html.spec.whatwg.org/multipage/forms.html#category-label
virtual bool is_labelable() const override { return true; }
bool using_system_appearance() const;
private:
void progress_position_updated();
bool is_determinate() const { return has_attribute(HTML::AttributeNames::value); }
};

19
Userland/Libraries/LibWeb/Layout/TreeBuilder.cpp
View file

@ -1,6 +1,7 @@
/*
* Copyright (c) 2018-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022, MacDue <macdue@dueutil.tech>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -12,10 +13,12 @@
#include <LibWeb/DOM/ParentNode.h>
#include <LibWeb/DOM/ShadowRoot.h>
#include <LibWeb/Dump.h>
#include <LibWeb/HTML/HTMLProgressElement.h>
#include <LibWeb/Layout/InitialContainingBlock.h>
#include <LibWeb/Layout/ListItemBox.h>
#include <LibWeb/Layout/ListItemMarkerBox.h>
#include <LibWeb/Layout/Node.h>
#include <LibWeb/Layout/Progress.h>
#include <LibWeb/Layout/TableBox.h>
#include <LibWeb/Layout/TableCellBox.h>
#include <LibWeb/Layout/TableRowBox.h>
@ -253,6 +256,22 @@ void TreeBuilder::create_layout_tree(DOM::Node& dom_node, TreeBuilder::Context&
element.set_pseudo_element_node({}, CSS::Selector::PseudoElement::Marker, list_item_marker);
layout_node->append_child(move(list_item_marker));
}
if (is<HTML::HTMLProgressElement>(dom_node)) {
auto& progress = static_cast<HTML::HTMLProgressElement&>(dom_node);
if (!progress.using_system_appearance()) {
auto bar_style = style_computer.compute_style(progress, CSS::Selector::PseudoElement::ProgressBar);
auto value_style = style_computer.compute_style(progress, CSS::Selector::PseudoElement::ProgressValue);
auto position = progress.position();
value_style->set_property(CSS::PropertyID::Width, CSS::PercentageStyleValue::create(CSS::Percentage(position >= 0 ? round_to<int>(100 * position) : 0)));
auto progress_bar = adopt_ref(*new Layout::BlockContainer(document, nullptr, bar_style));
auto progress_value = adopt_ref(*new Layout::BlockContainer(document, nullptr, value_style));
progress_bar->append_child(*progress_value);
layout_node->append_child(*progress_bar);
progress.set_pseudo_element_node({}, CSS::Selector::PseudoElement::ProgressBar, progress_bar);
progress.set_pseudo_element_node({}, CSS::Selector::PseudoElement::ProgressValue, progress_value);
}
}
}
RefPtr<Node> TreeBuilder::build(DOM::Node& dom_node)