mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-11-22 07:30:19 +00:00
LibWeb: Implement support for scrollbar-gutter
This property is now correctly parsed. Ladybird always uses overlay scrollbars so this property does nothing.
This commit is contained in:
parent
bdb24f950e
commit
6623177265
Notes:
sideshowbarker
2024-07-16 22:51:10 +09:00
Author: https://github.com/lukewarlow Commit: https://github.com/LadybirdBrowser/ladybird/commit/6623177265 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/295 Reviewed-by: https://github.com/ADKaster Reviewed-by: https://github.com/AtkinsSJ Reviewed-by: https://github.com/tcl3
11 changed files with 138 additions and 0 deletions
|
@ -146,6 +146,7 @@ right: auto
|
|||
row-gap: auto
|
||||
rx: auto
|
||||
ry: auto
|
||||
scrollbar-gutter: auto
|
||||
scrollbar-width: auto
|
||||
stop-color: rgb(0, 0, 0)
|
||||
stop-opacity: 1
|
||||
|
|
|
@ -362,6 +362,11 @@
|
|||
"middle",
|
||||
"end"
|
||||
],
|
||||
"scrollbar-gutter": [
|
||||
"auto",
|
||||
"stable",
|
||||
"both-edges"
|
||||
],
|
||||
"scrollbar-width": [
|
||||
"auto",
|
||||
"thin",
|
||||
|
|
|
@ -85,6 +85,7 @@
|
|||
"bolder",
|
||||
"border-box",
|
||||
"both",
|
||||
"both-edges",
|
||||
"bottom",
|
||||
"break-word",
|
||||
"browser",
|
||||
|
@ -328,6 +329,7 @@
|
|||
"space-evenly",
|
||||
"square",
|
||||
"srgb",
|
||||
"stable",
|
||||
"standalone",
|
||||
"standard",
|
||||
"start",
|
||||
|
|
|
@ -69,6 +69,7 @@
|
|||
#include <LibWeb/CSS/StyleValues/RectStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/RevertStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ScrollbarGutterStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShorthandStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
||||
|
@ -5879,6 +5880,70 @@ RefPtr<GridAutoFlowStyleValue> Parser::parse_grid_auto_flow_value(TokenStream<Co
|
|||
return GridAutoFlowStyleValue::create(axis.value_or(GridAutoFlowStyleValue::Axis::Row), dense.value_or(GridAutoFlowStyleValue::Dense::No));
|
||||
}
|
||||
|
||||
// https://drafts.csswg.org/css-overflow/#propdef-scrollbar-gutter
|
||||
RefPtr<StyleValue> Parser::parse_scrollbar_gutter_value(TokenStream<ComponentValue>& tokens)
|
||||
{
|
||||
// auto | stable && both-edges?
|
||||
if (!tokens.has_next_token())
|
||||
return nullptr;
|
||||
|
||||
auto transaction = tokens.begin_transaction();
|
||||
|
||||
auto parse_stable = [&]() -> Optional<bool> {
|
||||
auto transaction = tokens.begin_transaction();
|
||||
auto token = tokens.next_token();
|
||||
if (!token.is(Token::Type::Ident))
|
||||
return {};
|
||||
auto const& ident = token.token().ident();
|
||||
if (ident.equals_ignoring_ascii_case("auto"sv)) {
|
||||
transaction.commit();
|
||||
return false;
|
||||
} else if (ident.equals_ignoring_ascii_case("stable"sv)) {
|
||||
transaction.commit();
|
||||
return true;
|
||||
}
|
||||
return {};
|
||||
};
|
||||
|
||||
auto parse_both_edges = [&]() -> Optional<bool> {
|
||||
auto transaction = tokens.begin_transaction();
|
||||
auto token = tokens.next_token();
|
||||
if (!token.is(Token::Type::Ident))
|
||||
return {};
|
||||
auto const& ident = token.token().ident();
|
||||
if (ident.equals_ignoring_ascii_case("both-edges"sv)) {
|
||||
transaction.commit();
|
||||
return true;
|
||||
}
|
||||
return {};
|
||||
};
|
||||
|
||||
Optional<bool> stable;
|
||||
Optional<bool> both_edges;
|
||||
if (stable = parse_stable(); stable.has_value()) {
|
||||
if (stable.value())
|
||||
both_edges = parse_both_edges();
|
||||
} else if (both_edges = parse_both_edges(); both_edges.has_value()) {
|
||||
stable = parse_stable();
|
||||
if (!stable.has_value() || !stable.value())
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (tokens.has_next_token())
|
||||
return nullptr;
|
||||
|
||||
transaction.commit();
|
||||
|
||||
ScrollbarGutter gutter_value;
|
||||
if (both_edges.has_value())
|
||||
gutter_value = ScrollbarGutter::BothEdges;
|
||||
else if (stable.has_value() && stable.value())
|
||||
gutter_value = ScrollbarGutter::Stable;
|
||||
else
|
||||
gutter_value = ScrollbarGutter::Auto;
|
||||
return ScrollbarGutterStyleValue::create(gutter_value);
|
||||
}
|
||||
|
||||
RefPtr<StyleValue> Parser::parse_grid_auto_track_sizes(TokenStream<ComponentValue>& tokens)
|
||||
{
|
||||
// https://www.w3.org/TR/css-grid-2/#auto-tracks
|
||||
|
@ -6473,6 +6538,10 @@ Parser::ParseErrorOr<NonnullRefPtr<StyleValue>> Parser::parse_css_value(Property
|
|||
if (auto parsed_value = parse_quotes_value(tokens); parsed_value && !tokens.has_next_token())
|
||||
return parsed_value.release_nonnull();
|
||||
return ParseError::SyntaxError;
|
||||
case PropertyID::ScrollbarGutter:
|
||||
if (auto parsed_value = parse_scrollbar_gutter_value(tokens); parsed_value && !tokens.has_next_token())
|
||||
return parsed_value.release_nonnull();
|
||||
return ParseError::SyntaxError;
|
||||
case PropertyID::TextDecoration:
|
||||
if (auto parsed_value = parse_text_decoration_value(tokens); parsed_value && !tokens.has_next_token())
|
||||
return parsed_value.release_nonnull();
|
||||
|
|
|
@ -320,6 +320,7 @@ private:
|
|||
RefPtr<StyleValue> parse_place_items_value(TokenStream<ComponentValue>&);
|
||||
RefPtr<StyleValue> parse_place_self_value(TokenStream<ComponentValue>&);
|
||||
RefPtr<StyleValue> parse_quotes_value(TokenStream<ComponentValue>&);
|
||||
RefPtr<StyleValue> parse_scrollbar_gutter_value(TokenStream<ComponentValue>&);
|
||||
enum class AllowInsetKeyword {
|
||||
No,
|
||||
Yes,
|
||||
|
|
|
@ -2139,6 +2139,13 @@
|
|||
"unitless-length"
|
||||
]
|
||||
},
|
||||
"scrollbar-gutter": {
|
||||
"affects-layout": false,
|
||||
"animation-type": "discrete",
|
||||
"__comment": "This property should affect layout per-spec, but ladybird always uses overlay scrollbars so it doesn't in practice.",
|
||||
"inherited": false,
|
||||
"initial": "auto"
|
||||
},
|
||||
"scrollbar-width": {
|
||||
"affects-layout": false,
|
||||
"animation-type": "by-computed-value",
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/PositionStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/RectStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ScrollbarGutterStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StyleValueList.h>
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
#include <LibWeb/CSS/StyleValues/RectStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/RevertStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ScrollbarGutterStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/ShorthandStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
||||
|
|
|
@ -119,6 +119,7 @@ using StyleValueVector = Vector<ValueComparingNonnullRefPtr<StyleValue const>>;
|
|||
__ENUMERATE_STYLE_VALUE_TYPE(Rect, rect) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(Resolution, resolution) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(Revert, revert) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(ScrollbarGutter, scrollbar_gutter) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(Shadow, shadow) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(Shorthand, shorthand) \
|
||||
__ENUMERATE_STYLE_VALUE_TYPE(String, string) \
|
||||
|
|
|
@ -0,0 +1,49 @@
|
|||
/*
|
||||
* Copyright (c) 2024, the Ladybird developers.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibWeb/CSS/StyleValue.h>
|
||||
|
||||
namespace Web::CSS {
|
||||
|
||||
class ScrollbarGutterStyleValue final : public StyleValueWithDefaultOperators<ScrollbarGutterStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<ScrollbarGutterStyleValue> create(ScrollbarGutter value)
|
||||
{
|
||||
return adopt_ref(*new (nothrow) ScrollbarGutterStyleValue(value));
|
||||
}
|
||||
virtual ~ScrollbarGutterStyleValue() override = default;
|
||||
|
||||
ScrollbarGutter value() const { return m_value; }
|
||||
|
||||
virtual String to_string() const override
|
||||
{
|
||||
switch (m_value) {
|
||||
case ScrollbarGutter::Auto:
|
||||
return "auto"_string;
|
||||
case ScrollbarGutter::Stable:
|
||||
return "stable"_string;
|
||||
case ScrollbarGutter::BothEdges:
|
||||
return "stable both-edges"_string;
|
||||
default:
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
}
|
||||
|
||||
bool properties_equal(ScrollbarGutterStyleValue const& other) const { return m_value == other.m_value; }
|
||||
|
||||
private:
|
||||
ScrollbarGutterStyleValue(ScrollbarGutter value)
|
||||
: StyleValueWithDefaultOperators(Type::ScrollbarGutter)
|
||||
, m_value(value)
|
||||
{
|
||||
}
|
||||
|
||||
ScrollbarGutter m_value;
|
||||
};
|
||||
|
||||
}
|
|
@ -181,6 +181,7 @@ class ResolutionStyleValue;
|
|||
class RevertStyleValue;
|
||||
class Screen;
|
||||
class ScreenOrientation;
|
||||
class ScrollbarGutterStyleValue;
|
||||
class Selector;
|
||||
class ShadowStyleValue;
|
||||
class ShorthandStyleValue;
|
||||
|
|
Loading…
Reference in a new issue