OSSForks/ladybird
1
0
Fork 0
mirror of https://github.com/zebrajr/ladybird.git synced 2025-12-06 00:19:53 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

LibWeb: Adjust buttons computed display style
Some checks failed
CI / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (arm64, Sanitizer, false, macOS, ["macos-15", "self-hosted"], Clang) (push) Has been cancelled
Details
CI / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, All_Debug, false, Linux, ["blacksmith-16vcpu-ubuntu-2404"], Clang) (push) Has been cancelled
Details
CI / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Fuzzers, false, Linux, ["blacksmith-16vcpu-ubuntu-2404"], Clang) (push) Has been cancelled
Details
CI / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Sanitizer, false, Linux, ["blacksmith-16vcpu-ubuntu-2404"], GNU) (push) Has been cancelled
Details
CI / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Sanitizer, true, Linux, ["blacksmith-16vcpu-ubuntu-2404"], Clang) (push) Has been cancelled
Details
Build Dev Container Image / build (push) Has been cancelled
Details
Run test262 and test-wasm / run_and_update_results (push) Has been cancelled
Details
Lint Code / lint (push) Has been cancelled
Details
Label PRs with merge conflicts / auto-labeler (push) Has been cancelled
Details
Push notes / build (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (arm64, Distribution, false, Linux, ["blacksmith-8vcpu-ubuntu-2404-arm"], Clang) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (arm64, Distribution, false, macOS, ["macos-15"], Clang) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (arm64, Sanitizer, false, Linux, ["blacksmith-8vcpu-ubuntu-2404-arm"], Clang) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (arm64, Sanitizer, false, macOS, ["macos-15"], Swift) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Distribution, false, Linux, ["blacksmith-8vcpu-ubuntu-2404"], GNU) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Sanitizer, false, Linux, ["blacksmith-8vcpu-ubuntu-2404"], Swift) (push) Has been cancelled
Details
Nightly Lagom / ${{ matrix.os_name }}, ${{ matrix.arch }}, ${{ matrix.build_preset }}, ${{ matrix.toolchain }} (x86_64, Windows_Sanitizer_CI, false, Windows, ["windows-2025"], ClangCL) (push) Has been cancelled
Details
Nightly Lagom / Flatpak ${{ matrix.arch }} (aarch64, ["ubuntu-24.04-arm"]) (push) Has been cancelled
Details
Nightly Lagom / Flatpak ${{ matrix.arch }} (x86_64, ["ubuntu-24.04"]) (push) Has been cancelled
Details
Nightly Android / CI (macos-14, Android) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenz A 2025-10-15 11:57:00 +02:00 committed by Sam Atkins
parent 4bcb34d7a0
commit f54793315c
5 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/LibWeb/CSS/StyleComputer.cpp
View File

@ -2350,6 +2350,7 @@ GC::Ptr<ComputedProperties> StyleComputer::compute_style_impl(DOM::AbstractEleme
for (auto const& property : inline_style->properties()) for (auto const& property : inline_style->properties())
style->set_property(property.property_id, property.value); style->set_property(property.property_id, property.value);
} }
abstract_element.element().adjust_computed_style(style);
return style; return style;
} }
@ -2603,7 +2604,8 @@ GC::Ref<ComputedProperties> StyleComputer::compute_properties(DOM::AbstractEleme
compute_text_align(computed_style, abstract_element); compute_text_align(computed_style, abstract_element);
// 8. Let the element adjust computed style // 8. Let the element adjust computed style
abstract_element.element().adjust_computed_style(computed_style); if (!abstract_element.pseudo_element().has_value())
abstract_element.element().adjust_computed_style(computed_style);
// 9. Transition declarations [css-transitions-1] // 9. Transition declarations [css-transitions-1]
// Theoretically this should be part of the cascade, but it works with computed values, which we don't have until now. // Theoretically this should be part of the cascade, but it works with computed values, which we don't have until now.

19
Libraries/LibWeb/HTML/HTMLButtonElement.cpp
View File

@ -5,6 +5,8 @@
*/ */
#include <LibWeb/Bindings/HTMLButtonElementPrototype.h> #include <LibWeb/Bindings/HTMLButtonElementPrototype.h>
#include <LibWeb/CSS/ComputedProperties.h>
#include <LibWeb/CSS/StyleValues/DisplayStyleValue.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Event.h> #include <LibWeb/DOM/Event.h>
#include <LibWeb/HTML/CommandEvent.h> #include <LibWeb/HTML/CommandEvent.h>
@ -29,6 +31,23 @@ void HTMLButtonElement::initialize(JS::Realm& realm)
Base::initialize(realm); Base::initialize(realm);
} }
void HTMLButtonElement::adjust_computed_style(CSS::ComputedProperties& style)
{
// https://html.spec.whatwg.org/multipage/rendering.html#button-layout
// If the computed value of 'display' is 'inline-grid', 'grid', 'inline-flex', 'flex', 'none', or 'contents', then behave as the computed value.
auto display = style.display();
if (display.is_flex_inside() || display.is_grid_inside() || display.is_none() || display.is_contents()) {
// No-op
} else if (display.is_inline_outside()) {
// Otherwise, if the computed value of 'display' is a value such that the outer display type is 'inline', then behave as 'inline-block'.
// AD-HOC https://github.com/whatwg/html/issues/11857
style.set_property(CSS::PropertyID::Display, CSS::DisplayStyleValue::create(CSS::Display::from_short(CSS::Display::Short::InlineBlock)));
} else {
// Otherwise, behave as 'flow-root'.
style.set_property(CSS::PropertyID::Display, CSS::DisplayStyleValue::create(CSS::Display::from_short(CSS::Display::Short::FlowRoot)));
}
}
HTMLButtonElement::TypeAttributeState HTMLButtonElement::type_state() const HTMLButtonElement::TypeAttributeState HTMLButtonElement::type_state() const
{ {
auto value = get_attribute_value(HTML::AttributeNames::type); auto value = get_attribute_value(HTML::AttributeNames::type);

1
Libraries/LibWeb/HTML/HTMLButtonElement.h
View File

@ -31,6 +31,7 @@ public:
virtual ~HTMLButtonElement() override; virtual ~HTMLButtonElement() override;
virtual void initialize(JS::Realm&) override; virtual void initialize(JS::Realm&) override;
virtual void adjust_computed_style(CSS::ComputedProperties&) override;
enum class TypeAttributeState { enum class TypeAttributeState {
#define __ENUMERATE_HTML_BUTTON_TYPE_ATTRIBUTE(_, state) state, #define __ENUMERATE_HTML_BUTTON_TYPE_ATTRIBUTE(_, state) state,

4
Tests/LibWeb/Layout/expected/block-and-inline/button-width.txt
View File

@ -1,13 +1,13 @@
Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-inline Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-inline
BlockContainer <html> at [0,0] [0+0+0 800 0+0+0] [0+0+0 60 0+0+0] [BFC] children: not-inline BlockContainer <html> at [0,0] [0+0+0 800 0+0+0] [0+0+0 60 0+0+0] [BFC] children: not-inline
BlockContainer <body> at [8,8] [8+0+0 784 0+0+8] [8+0+0 44 0+0+8] children: not-inline BlockContainer <body> at [8,8] [8+0+0 784 0+0+8] [8+0+0 44 0+0+8] children: not-inline
BlockContainer <button.btn.fixed-width> at [13,10] [0+1+4 190 4+1+584] [0+1+1 18 1+1+0] children: not-inline BlockContainer <button.btn.fixed-width> at [13,10] [0+1+4 190 4+1+584] [0+1+1 18 1+1+0] [BFC] children: not-inline
BlockContainer <(anonymous)> at [13,10] flex-container(column) [0+0+0 190 0+0+0] [0+0+0 18 0+0+0] [FFC] children: not-inline BlockContainer <(anonymous)> at [13,10] flex-container(column) [0+0+0 190 0+0+0] [0+0+0 18 0+0+0] [FFC] children: not-inline
BlockContainer <(anonymous)> at [13,10] flex-item [0+0+0 190 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline BlockContainer <(anonymous)> at [13,10] flex-item [0+0+0 190 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
frag 0 from TextNode start: 0, length: 11, rect: [60.53125,10 94.921875x18] baseline: 13.796875 frag 0 from TextNode start: 0, length: 11, rect: [60.53125,10 94.921875x18] baseline: 13.796875
"200px width" "200px width"
TextNode <#text> (not painted) TextNode <#text> (not painted)
BlockContainer <button.btn> at [13,32] [0+1+4 324.671875 4+1+0] [0+1+1 18 1+1+0] children: not-inline BlockContainer <button.btn> at [13,32] [0+1+4 324.671875 4+1+0] [0+1+1 18 1+1+0] [BFC] children: not-inline
BlockContainer <(anonymous)> at [13,32] flex-container(column) [0+0+0 324.671875 0+0+0] [0+0+0 18 0+0+0] [FFC] children: not-inline BlockContainer <(anonymous)> at [13,32] flex-container(column) [0+0+0 324.671875 0+0+0] [0+0+0 18 0+0+0] [FFC] children: not-inline
BlockContainer <(anonymous)> at [13,32] flex-item [0+0+0 324.671875 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline BlockContainer <(anonymous)> at [13,32] flex-item [0+0+0 324.671875 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
frag 0 from TextNode start: 0, length: 39, rect: [13,32 324.671875x18] baseline: 13.796875 frag 0 from TextNode start: 0, length: 39, rect: [13,32 324.671875x18] baseline: 13.796875

33
Tests/LibWeb/Text/expected/wpt-import/html/rendering/widgets/button-layout/display-other.txt
View File

@ -2,23 +2,22 @@ Harness status: OK
Found 18 tests Found 18 tests
3 Pass 18 Pass
15 Fail Pass display: block
Fail display: block
Pass display: run-in Pass display: run-in
Pass display: flow Pass display: flow
Fail display: flow-root Pass display: flow-root
Fail display: table Pass display: table
Pass display: list-item Pass display: list-item
Fail display: table-row-group Pass display: table-row-group
Fail display: table-header-group Pass display: table-header-group
Fail display: table-footer-group Pass display: table-footer-group
Fail display: table-row Pass display: table-row
Fail display: table-cell Pass display: table-cell
Fail display: table-column-group Pass display: table-column-group
Fail display: table-column Pass display: table-column
Fail display: table-caption Pass display: table-caption
Fail display: ruby-base Pass display: ruby-base
Fail display: ruby-text Pass display: ruby-text
Fail display: ruby-base-container Pass display: ruby-base-container
Fail display: ruby-text-container Pass display: ruby-text-container