RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:57:34 +00:00
Code Issues Activity Actions

LibWeb: Replace PlaceItemsStyleValue with ShorthandStyleValue

Browse source
This commit is contained in:
Sam Atkins 2023-09-20 15:30:36 +01:00 • committed by Sam Atkins
parent 8143d48161
commit 6e311902de
10 changed files with 13 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibWeb/CSS/StyleValues/PlaceItemsStyleValue.cpp
View file

@ -1,20 +0,0 @@
/*
* Copyright (c) 2023, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "PlaceItemsStyleValue.h"
namespace Web::CSS {
String PlaceItemsStyleValue::to_string() const
{
auto align_items = m_properties.align_items->to_string();
auto justify_items = m_properties.justify_items->to_string();
if (align_items == justify_items)
return MUST(String::formatted("{}", align_items));
return MUST(String::formatted("{} {}", align_items, justify_items));
}
}

42
Userland/Libraries/LibWeb/CSS/StyleValues/PlaceItemsStyleValue.h
View file

@ -1,42 +0,0 @@
/*
* Copyright (c) 2023, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibWeb/CSS/StyleValue.h>
namespace Web::CSS {
class PlaceItemsStyleValue final : public StyleValueWithDefaultOperators<PlaceItemsStyleValue> {
public:
static ValueComparingNonnullRefPtr<PlaceItemsStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> align_items, ValueComparingNonnullRefPtr<StyleValue> justify_items)
{
return adopt_ref(*new (nothrow) PlaceItemsStyleValue(move(align_items), move(justify_items)));
}
virtual ~PlaceItemsStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> align_items() const { return m_properties.align_items; }
ValueComparingNonnullRefPtr<StyleValue> justify_items() const { return m_properties.justify_items; }
virtual String to_string() const override;
bool properties_equal(PlaceItemsStyleValue const& other) const { return m_properties == other.m_properties; }
private:
PlaceItemsStyleValue(ValueComparingNonnullRefPtr<StyleValue> align_items, ValueComparingNonnullRefPtr<StyleValue> justify_items)
: StyleValueWithDefaultOperators(Type::PlaceItems)
, m_properties { .align_items = move(align_items), .justify_items = move(justify_items) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> align_items;
ValueComparingNonnullRefPtr<StyleValue> justify_items;
bool operator==(Properties const&) const = default;
} m_properties;
};
}

7
Userland/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp
View file

@ -154,6 +154,13 @@ String ShorthandStyleValue::to_string() const
return align_content;
return MUST(String::formatted("{} {}", align_content, justify_content));
}
case PropertyID::PlaceItems: {
auto align_items = longhand(PropertyID::AlignItems)->to_string();
auto justify_items = longhand(PropertyID::JustifyItems)->to_string();
if (align_items == justify_items)
return align_items;
return MUST(String::formatted("{} {}", align_items, justify_items));
}
case PropertyID::PlaceSelf: {
auto align_self = longhand(PropertyID::AlignSelf)->to_string();
auto justify_self = longhand(PropertyID::JustifySelf)->to_string();