mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 11:22:45 +00:00 
			
		
		
		
	 a05fd28b7b
			
		
	
	
		a05fd28b7b
		
	
	
	
	
		
			
			The styling of elements using the `use_pseudo_element()` was only applied on layout. When an element style was recomputed later that styling was not overruled with the pseudo element selector styles. This moves the styling override from `TreeBuilder.cpp` to `StyleComputer.cpp`. Now the styles are always correctly applied. I also removed the method `property_id_by_index()` because it was not needed anymore. Als some calls to `invalidate_layout()` in the Meter, Progress and Select elements where not needed anymore because the style values are update on the changing of the style attribute. This fixes issue #22278.
		
			
				
	
	
		
			120 lines
		
	
	
	
		
			3.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			120 lines
		
	
	
	
		
			3.6 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2020-2022, the SerenityOS developers.
 | |
|  * Copyright (c) 2022, MacDue <macdue@dueutil.tech>
 | |
|  * Copyright (c) 2023, Bastiaan van der Plaat <bastiaan.v.d.plaat@gmail.com>
 | |
|  *
 | |
|  * SPDX-License-Identifier: BSD-2-Clause
 | |
|  */
 | |
| 
 | |
| #include <LibWeb/DOM/Document.h>
 | |
| #include <LibWeb/DOM/ElementFactory.h>
 | |
| #include <LibWeb/DOM/ShadowRoot.h>
 | |
| #include <LibWeb/HTML/HTMLProgressElement.h>
 | |
| #include <LibWeb/HTML/Numbers.h>
 | |
| #include <LibWeb/Namespace.h>
 | |
| 
 | |
| namespace Web::HTML {
 | |
| 
 | |
| JS_DEFINE_ALLOCATOR(HTMLProgressElement);
 | |
| 
 | |
| HTMLProgressElement::HTMLProgressElement(DOM::Document& document, DOM::QualifiedName qualified_name)
 | |
|     : HTMLElement(document, move(qualified_name))
 | |
| {
 | |
| }
 | |
| 
 | |
| HTMLProgressElement::~HTMLProgressElement() = default;
 | |
| 
 | |
| void HTMLProgressElement::initialize(JS::Realm& realm)
 | |
| {
 | |
|     Base::initialize(realm);
 | |
|     set_prototype(&Bindings::ensure_web_prototype<Bindings::HTMLProgressElementPrototype>(realm, "HTMLProgressElement"_fly_string));
 | |
| }
 | |
| 
 | |
| void HTMLProgressElement::visit_edges(Cell::Visitor& visitor)
 | |
| {
 | |
|     Base::visit_edges(visitor);
 | |
|     visitor.visit(m_progress_value_element);
 | |
| }
 | |
| 
 | |
| // https://html.spec.whatwg.org/multipage/form-elements.html#dom-progress-value
 | |
| double HTMLProgressElement::value() const
 | |
| {
 | |
|     if (auto value_string = get_attribute(HTML::AttributeNames::value); value_string.has_value()) {
 | |
|         if (auto value = parse_floating_point_number(*value_string); value.has_value())
 | |
|             return clamp(*value, 0, max());
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| WebIDL::ExceptionOr<void> HTMLProgressElement::set_value(double value)
 | |
| {
 | |
|     if (value < 0 || value > max())
 | |
|         return {};
 | |
| 
 | |
|     TRY(set_attribute(HTML::AttributeNames::value, MUST(String::number(value))));
 | |
|     update_progress_value_element();
 | |
|     return {};
 | |
| }
 | |
| 
 | |
| // https://html.spec.whatwg.org/multipage/form-elements.html#dom-progress-max
 | |
| double HTMLProgressElement::max() const
 | |
| {
 | |
|     if (auto max_string = get_attribute(HTML::AttributeNames::max); max_string.has_value()) {
 | |
|         if (auto max = parse_floating_point_number(*max_string); max.has_value())
 | |
|             return AK::max(*max, 0);
 | |
|     }
 | |
|     return 1;
 | |
| }
 | |
| 
 | |
| WebIDL::ExceptionOr<void> HTMLProgressElement::set_max(double value)
 | |
| {
 | |
|     if (value <= 0)
 | |
|         return {};
 | |
| 
 | |
|     TRY(set_attribute(HTML::AttributeNames::max, MUST(String::number(value))));
 | |
|     update_progress_value_element();
 | |
|     return {};
 | |
| }
 | |
| 
 | |
| double HTMLProgressElement::position() const
 | |
| {
 | |
|     if (!is_determinate())
 | |
|         return -1;
 | |
| 
 | |
|     return value() / max();
 | |
| }
 | |
| 
 | |
| void HTMLProgressElement::inserted()
 | |
| {
 | |
|     create_shadow_tree_if_needed();
 | |
| }
 | |
| 
 | |
| void HTMLProgressElement::removed_from(DOM::Node*)
 | |
| {
 | |
|     set_shadow_root(nullptr);
 | |
| }
 | |
| 
 | |
| void HTMLProgressElement::create_shadow_tree_if_needed()
 | |
| {
 | |
|     if (shadow_root_internal())
 | |
|         return;
 | |
| 
 | |
|     auto shadow_root = heap().allocate<DOM::ShadowRoot>(realm(), document(), *this, Bindings::ShadowRootMode::Closed);
 | |
|     set_shadow_root(shadow_root);
 | |
| 
 | |
|     auto progress_bar_element = MUST(DOM::create_element(document(), HTML::TagNames::div, Namespace::HTML));
 | |
|     progress_bar_element->set_use_pseudo_element(CSS::Selector::PseudoElement::Type::ProgressBar);
 | |
|     MUST(shadow_root->append_child(*progress_bar_element));
 | |
| 
 | |
|     m_progress_value_element = MUST(DOM::create_element(document(), HTML::TagNames::div, Namespace::HTML));
 | |
|     m_progress_value_element->set_use_pseudo_element(CSS::Selector::PseudoElement::Type::ProgressValue);
 | |
|     MUST(progress_bar_element->append_child(*m_progress_value_element));
 | |
|     update_progress_value_element();
 | |
| }
 | |
| 
 | |
| void HTMLProgressElement::update_progress_value_element()
 | |
| {
 | |
|     MUST(m_progress_value_element->style_for_bindings()->set_property(CSS::PropertyID::Width, MUST(String::formatted("{}%", position() * 100))));
 | |
| }
 | |
| 
 | |
| }
 |