Skip to content

Commit e10d63e

Browse files
xeenonxeenon
committed
Selection color is dark when using Safari in dark mode.
https://bugs.webkit.org/show_bug.cgi?id=186288 rdar://problem/38438625 Reviewed by Simon Fraser. Pass StyleColor::Options to all of the selection color functions. Removed supportsSelectionForegroundColors() from RenderThemeMac, to get the default of true, since the forground colors in dark mode can be different now. Use new semantic color methods on NSColor. * rendering/RenderElement.cpp: (WebCore::RenderElement::selectionColor const): (WebCore::RenderElement::selectionBackgroundColor const): * rendering/RenderListBox.cpp: (WebCore::RenderListBox::paintItemForeground): (WebCore::RenderListBox::paintItemBackground): * rendering/RenderTheme.cpp: (WebCore::RenderTheme::activeSelectionBackgroundColor const): (WebCore::RenderTheme::inactiveSelectionBackgroundColor const): (WebCore::RenderTheme::activeSelectionForegroundColor const): (WebCore::RenderTheme::inactiveSelectionForegroundColor const): (WebCore::RenderTheme::activeListBoxSelectionBackgroundColor const): (WebCore::RenderTheme::activeListBoxSelectionForegroundColor const): (WebCore::RenderTheme::inactiveListBoxSelectionForegroundColor const): (WebCore::RenderTheme::platformActiveSelectionBackgroundColor const): (WebCore::RenderTheme::platformActiveSelectionForegroundColor const): (WebCore::RenderTheme::platformInactiveSelectionBackgroundColor const): (WebCore::RenderTheme::platformInactiveSelectionForegroundColor const): (WebCore::RenderTheme::platformActiveListBoxSelectionBackgroundColor const): (WebCore::RenderTheme::platformActiveListBoxSelectionForegroundColor const): (WebCore::RenderTheme::platformInactiveListBoxSelectionBackgroundColor const): (WebCore::RenderTheme::platformInactiveListBoxSelectionForegroundColor const): * rendering/RenderTheme.h: * rendering/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::platformActiveSelectionBackgroundColor const): (WebCore::RenderThemeGtk::platformInactiveSelectionBackgroundColor const): (WebCore::RenderThemeGtk::platformActiveSelectionForegroundColor const): (WebCore::RenderThemeGtk::platformInactiveSelectionForegroundColor const): (WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor const): (WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor const): (WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor const): * rendering/RenderThemeGtk.h: * rendering/RenderThemeIOS.h: * rendering/RenderThemeIOS.mm: (WebCore::RenderThemeIOS::platformActiveSelectionBackgroundColor const): (WebCore::RenderThemeIOS::platformInactiveSelectionBackgroundColor const): * rendering/RenderThemeMac.h: * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const): (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const): (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const): (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const): (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const): * rendering/RenderThemeWin.cpp: (WebCore::RenderThemeWin::platformActiveSelectionBackgroundColor const): (WebCore::RenderThemeWin::platformInactiveSelectionBackgroundColor const): (WebCore::RenderThemeWin::platformActiveSelectionForegroundColor const): (WebCore::RenderThemeWin::platformInactiveSelectionForegroundColor const): * rendering/RenderThemeWin.h: Canonical link: https://commits.webkit.org/201667@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent e7e9c98 commit e10d63e

13 files changed

Lines changed: 202 additions & 95 deletions

‎Source/WebCore/ChangeLog‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
2018-06-04 Timothy Hatcher <timothy@apple.com>
2+
3+
Selection color is dark when using Safari in dark mode.
4+
5+
https://bugs.webkit.org/show_bug.cgi?id=186288
6+
rdar://problem/38438625
7+
8+
Reviewed by Simon Fraser.
9+
10+
Pass StyleColor::Options to all of the selection color functions.
11+
Removed supportsSelectionForegroundColors() from RenderThemeMac,
12+
to get the default of true, since the forground colors in dark mode
13+
can be different now. Use new semantic color methods on NSColor.
14+
15+
* rendering/RenderElement.cpp:
16+
(WebCore::RenderElement::selectionColor const):
17+
(WebCore::RenderElement::selectionBackgroundColor const):
18+
* rendering/RenderListBox.cpp:
19+
(WebCore::RenderListBox::paintItemForeground):
20+
(WebCore::RenderListBox::paintItemBackground):
21+
* rendering/RenderTheme.cpp:
22+
(WebCore::RenderTheme::activeSelectionBackgroundColor const):
23+
(WebCore::RenderTheme::inactiveSelectionBackgroundColor const):
24+
(WebCore::RenderTheme::activeSelectionForegroundColor const):
25+
(WebCore::RenderTheme::inactiveSelectionForegroundColor const):
26+
(WebCore::RenderTheme::activeListBoxSelectionBackgroundColor const):
27+
(WebCore::RenderTheme::activeListBoxSelectionForegroundColor const):
28+
(WebCore::RenderTheme::inactiveListBoxSelectionForegroundColor const):
29+
(WebCore::RenderTheme::platformActiveSelectionBackgroundColor const):
30+
(WebCore::RenderTheme::platformActiveSelectionForegroundColor const):
31+
(WebCore::RenderTheme::platformInactiveSelectionBackgroundColor const):
32+
(WebCore::RenderTheme::platformInactiveSelectionForegroundColor const):
33+
(WebCore::RenderTheme::platformActiveListBoxSelectionBackgroundColor const):
34+
(WebCore::RenderTheme::platformActiveListBoxSelectionForegroundColor const):
35+
(WebCore::RenderTheme::platformInactiveListBoxSelectionBackgroundColor const):
36+
(WebCore::RenderTheme::platformInactiveListBoxSelectionForegroundColor const):
37+
* rendering/RenderTheme.h:
38+
* rendering/RenderThemeGtk.cpp:
39+
(WebCore::RenderThemeGtk::platformActiveSelectionBackgroundColor const):
40+
(WebCore::RenderThemeGtk::platformInactiveSelectionBackgroundColor const):
41+
(WebCore::RenderThemeGtk::platformActiveSelectionForegroundColor const):
42+
(WebCore::RenderThemeGtk::platformInactiveSelectionForegroundColor const):
43+
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor const):
44+
(WebCore::RenderThemeGtk::platformActiveListBoxSelectionForegroundColor const):
45+
(WebCore::RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor const):
46+
* rendering/RenderThemeGtk.h:
47+
* rendering/RenderThemeIOS.h:
48+
* rendering/RenderThemeIOS.mm:
49+
(WebCore::RenderThemeIOS::platformActiveSelectionBackgroundColor const):
50+
(WebCore::RenderThemeIOS::platformInactiveSelectionBackgroundColor const):
51+
* rendering/RenderThemeMac.h:
52+
* rendering/RenderThemeMac.mm:
53+
(WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const):
54+
(WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
55+
(WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const):
56+
(WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const):
57+
(WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const):
58+
(WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
59+
(WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const):
60+
(WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const):
61+
* rendering/RenderThemeWin.cpp:
62+
(WebCore::RenderThemeWin::platformActiveSelectionBackgroundColor const):
63+
(WebCore::RenderThemeWin::platformInactiveSelectionBackgroundColor const):
64+
(WebCore::RenderThemeWin::platformActiveSelectionForegroundColor const):
65+
(WebCore::RenderThemeWin::platformInactiveSelectionForegroundColor const):
66+
* rendering/RenderThemeWin.h:
67+
168
2018-06-04 Chris Dumez <cdumez@apple.com>
269

370
Update Fetch code to provide more useful exception messages

‎Source/WebCore/rendering/RenderElement.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,8 +1372,8 @@ Color RenderElement::selectionColor(CSSPropertyID colorProperty) const
13721372
}
13731373

13741374
if (frame().selection().isFocusedAndActive())
1375-
return theme().activeSelectionForegroundColor();
1376-
return theme().inactiveSelectionForegroundColor();
1375+
return theme().activeSelectionForegroundColor(document().styleColorOptions());
1376+
return theme().inactiveSelectionForegroundColor(document().styleColorOptions());
13771377
}
13781378

13791379
std::unique_ptr<RenderStyle> RenderElement::selectionPseudoStyle() const
@@ -1414,8 +1414,8 @@ Color RenderElement::selectionBackgroundColor() const
14141414
return pseudoStyle->visitedDependentColorWithColorFilter(CSSPropertyBackgroundColor).blendWithWhite();
14151415

14161416
if (frame().selection().isFocusedAndActive())
1417-
return theme().activeSelectionBackgroundColor();
1418-
return theme().inactiveSelectionBackgroundColor();
1417+
return theme().activeSelectionBackgroundColor(document().styleColorOptions());
1418+
return theme().inactiveSelectionBackgroundColor(document().styleColorOptions());
14191419
}
14201420

14211421
bool RenderElement::getLeadingCorner(FloatPoint& point, bool& insideFixed) const

‎Source/WebCore/rendering/RenderListBox.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ void RenderListBox::paintItemForeground(PaintInfo& paintInfo, const LayoutPoint&
425425
Color textColor = itemStyle.visitedDependentColorWithColorFilter(CSSPropertyColor);
426426
if (isOptionElement && downcast<HTMLOptionElement>(*listItemElement).selected()) {
427427
if (frame().selection().isFocusedAndActive() && document().focusedElement() == &selectElement())
428-
textColor = theme().activeListBoxSelectionForegroundColor();
428+
textColor = theme().activeListBoxSelectionForegroundColor(document().styleColorOptions());
429429
// Honor the foreground color for disabled items
430430
else if (!listItemElement->isDisabledFormControl() && !selectElement().isDisabledFormControl())
431-
textColor = theme().inactiveListBoxSelectionForegroundColor();
431+
textColor = theme().inactiveListBoxSelectionForegroundColor(document().styleColorOptions());
432432
}
433433

434434
paintInfo.context().setFillColor(textColor);
@@ -458,7 +458,7 @@ void RenderListBox::paintItemBackground(PaintInfo& paintInfo, const LayoutPoint&
458458
Color backColor;
459459
if (is<HTMLOptionElement>(*listItemElement) && downcast<HTMLOptionElement>(*listItemElement).selected()) {
460460
if (frame().selection().isFocusedAndActive() && document().focusedElement() == &selectElement())
461-
backColor = theme().activeListBoxSelectionBackgroundColor();
461+
backColor = theme().activeListBoxSelectionBackgroundColor(document().styleColorOptions());
462462
else
463463
backColor = theme().inactiveListBoxSelectionBackgroundColor(document().styleColorOptions());
464464
} else

‎Source/WebCore/rendering/RenderTheme.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -579,38 +579,38 @@ LayoutPoint RenderTheme::volumeSliderOffsetFromMuteButton(const RenderBox& muteB
579579

580580
#endif
581581

582-
Color RenderTheme::activeSelectionBackgroundColor() const
582+
Color RenderTheme::activeSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
583583
{
584584
if (!m_activeSelectionBackgroundColor.isValid())
585-
m_activeSelectionBackgroundColor = platformActiveSelectionBackgroundColor().blendWithWhite();
585+
m_activeSelectionBackgroundColor = platformActiveSelectionBackgroundColor(options).blendWithWhite();
586586
return m_activeSelectionBackgroundColor;
587587
}
588588

589-
Color RenderTheme::inactiveSelectionBackgroundColor() const
589+
Color RenderTheme::inactiveSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
590590
{
591591
if (!m_inactiveSelectionBackgroundColor.isValid())
592-
m_inactiveSelectionBackgroundColor = platformInactiveSelectionBackgroundColor().blendWithWhite();
592+
m_inactiveSelectionBackgroundColor = platformInactiveSelectionBackgroundColor(options).blendWithWhite();
593593
return m_inactiveSelectionBackgroundColor;
594594
}
595595

596-
Color RenderTheme::activeSelectionForegroundColor() const
596+
Color RenderTheme::activeSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
597597
{
598598
if (!m_activeSelectionForegroundColor.isValid() && supportsSelectionForegroundColors())
599-
m_activeSelectionForegroundColor = platformActiveSelectionForegroundColor();
599+
m_activeSelectionForegroundColor = platformActiveSelectionForegroundColor(options);
600600
return m_activeSelectionForegroundColor;
601601
}
602602

603-
Color RenderTheme::inactiveSelectionForegroundColor() const
603+
Color RenderTheme::inactiveSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
604604
{
605605
if (!m_inactiveSelectionForegroundColor.isValid() && supportsSelectionForegroundColors())
606-
m_inactiveSelectionForegroundColor = platformInactiveSelectionForegroundColor();
606+
m_inactiveSelectionForegroundColor = platformInactiveSelectionForegroundColor(options);
607607
return m_inactiveSelectionForegroundColor;
608608
}
609609

610-
Color RenderTheme::activeListBoxSelectionBackgroundColor() const
610+
Color RenderTheme::activeListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
611611
{
612612
if (!m_activeListBoxSelectionBackgroundColor.isValid())
613-
m_activeListBoxSelectionBackgroundColor = platformActiveListBoxSelectionBackgroundColor();
613+
m_activeListBoxSelectionBackgroundColor = platformActiveListBoxSelectionBackgroundColor(options);
614614
return m_activeListBoxSelectionBackgroundColor;
615615
}
616616

@@ -621,63 +621,63 @@ Color RenderTheme::inactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor:
621621
return m_inactiveListBoxSelectionBackgroundColor;
622622
}
623623

624-
Color RenderTheme::activeListBoxSelectionForegroundColor() const
624+
Color RenderTheme::activeListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
625625
{
626626
if (!m_activeListBoxSelectionForegroundColor.isValid() && supportsListBoxSelectionForegroundColors())
627-
m_activeListBoxSelectionForegroundColor = platformActiveListBoxSelectionForegroundColor();
627+
m_activeListBoxSelectionForegroundColor = platformActiveListBoxSelectionForegroundColor(options);
628628
return m_activeListBoxSelectionForegroundColor;
629629
}
630630

631-
Color RenderTheme::inactiveListBoxSelectionForegroundColor() const
631+
Color RenderTheme::inactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
632632
{
633633
if (!m_inactiveListBoxSelectionForegroundColor.isValid() && supportsListBoxSelectionForegroundColors())
634-
m_inactiveListBoxSelectionForegroundColor = platformInactiveListBoxSelectionForegroundColor();
634+
m_inactiveListBoxSelectionForegroundColor = platformInactiveListBoxSelectionForegroundColor(options);
635635
return m_inactiveListBoxSelectionForegroundColor;
636636
}
637637

638-
Color RenderTheme::platformActiveSelectionBackgroundColor() const
638+
Color RenderTheme::platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
639639
{
640640
// Use a blue color by default if the platform theme doesn't define anything.
641641
return Color(0, 0, 255);
642642
}
643643

644-
Color RenderTheme::platformActiveSelectionForegroundColor() const
644+
Color RenderTheme::platformActiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const
645645
{
646646
// Use a white color by default if the platform theme doesn't define anything.
647647
return Color::white;
648648
}
649649

650-
Color RenderTheme::platformInactiveSelectionBackgroundColor() const
650+
Color RenderTheme::platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
651651
{
652652
// Use a grey color by default if the platform theme doesn't define anything.
653653
// This color matches Firefox's inactive color.
654654
return Color(176, 176, 176);
655655
}
656656

657-
Color RenderTheme::platformInactiveSelectionForegroundColor() const
657+
Color RenderTheme::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const
658658
{
659659
// Use a black color by default.
660660
return Color::black;
661661
}
662662

663-
Color RenderTheme::platformActiveListBoxSelectionBackgroundColor() const
663+
Color RenderTheme::platformActiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
664664
{
665-
return platformActiveSelectionBackgroundColor();
665+
return platformActiveSelectionBackgroundColor(options);
666666
}
667667

668-
Color RenderTheme::platformActiveListBoxSelectionForegroundColor() const
668+
Color RenderTheme::platformActiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
669669
{
670-
return platformActiveSelectionForegroundColor();
670+
return platformActiveSelectionForegroundColor(options);
671671
}
672672

673-
Color RenderTheme::platformInactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
673+
Color RenderTheme::platformInactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
674674
{
675-
return platformInactiveSelectionBackgroundColor();
675+
return platformInactiveSelectionBackgroundColor(options);
676676
}
677677

678-
Color RenderTheme::platformInactiveListBoxSelectionForegroundColor() const
678+
Color RenderTheme::platformInactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
679679
{
680-
return platformInactiveSelectionForegroundColor();
680+
return platformInactiveSelectionForegroundColor(options);
681681
}
682682

683683
int RenderTheme::baselinePosition(const RenderBox& box) const

‎Source/WebCore/rendering/RenderTheme.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ class RenderTheme {
133133
virtual bool supportsDataListUI(const AtomicString&) const { return false; }
134134

135135
// Text selection colors.
136-
Color activeSelectionBackgroundColor() const;
137-
Color inactiveSelectionBackgroundColor() const;
138-
Color activeSelectionForegroundColor() const;
139-
Color inactiveSelectionForegroundColor() const;
136+
Color activeSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
137+
Color inactiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
138+
Color activeSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
139+
Color inactiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
140140

141141
// List box selection colors
142-
Color activeListBoxSelectionBackgroundColor() const;
143-
Color activeListBoxSelectionForegroundColor() const;
142+
Color activeListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
143+
Color activeListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
144144
Color inactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
145-
Color inactiveListBoxSelectionForegroundColor() const;
145+
Color inactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
146146

147147
// Highlighting colors for TextMatches.
148148
virtual Color platformActiveTextSearchHighlightColor() const;
@@ -255,15 +255,15 @@ class RenderTheme {
255255
virtual void updateCachedSystemFontDescription(CSSValueID systemFontID, FontCascadeDescription&) const = 0;
256256

257257
// The platform selection color.
258-
virtual Color platformActiveSelectionBackgroundColor() const;
259-
virtual Color platformInactiveSelectionBackgroundColor() const;
260-
virtual Color platformActiveSelectionForegroundColor() const;
261-
virtual Color platformInactiveSelectionForegroundColor() const;
258+
virtual Color platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
259+
virtual Color platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
260+
virtual Color platformActiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
261+
virtual Color platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
262262

263-
virtual Color platformActiveListBoxSelectionBackgroundColor() const;
263+
virtual Color platformActiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
264264
virtual Color platformInactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const;
265-
virtual Color platformActiveListBoxSelectionForegroundColor() const;
266-
virtual Color platformInactiveListBoxSelectionForegroundColor() const;
265+
virtual Color platformActiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
266+
virtual Color platformInactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const;
267267

268268
virtual bool supportsSelectionForegroundColors() const { return true; }
269269
virtual bool supportsListBoxSelectionForegroundColors() const { return true; }

‎Source/WebCore/rendering/RenderThemeGtk.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,27 +1716,27 @@ static Color styleColor(RenderThemePart themePart, GtkStateFlags state, StyleCol
17161716
}
17171717
#endif // GTK_CHECK_VERSION(3, 20, 0)
17181718

1719-
Color RenderThemeGtk::platformActiveSelectionBackgroundColor() const
1719+
Color RenderThemeGtk::platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
17201720
{
17211721
return styleColor(EntrySelection, static_cast<GtkStateFlags>(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED), StyleColorBackground);
17221722
}
17231723

1724-
Color RenderThemeGtk::platformInactiveSelectionBackgroundColor() const
1724+
Color RenderThemeGtk::platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
17251725
{
17261726
return styleColor(EntrySelection, GTK_STATE_FLAG_SELECTED, StyleColorBackground);
17271727
}
17281728

1729-
Color RenderThemeGtk::platformActiveSelectionForegroundColor() const
1729+
Color RenderThemeGtk::platformActiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const
17301730
{
17311731
return styleColor(EntrySelection, static_cast<GtkStateFlags>(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED), StyleColorForeground);
17321732
}
17331733

1734-
Color RenderThemeGtk::platformInactiveSelectionForegroundColor() const
1734+
Color RenderThemeGtk::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options>) const
17351735
{
17361736
return styleColor(EntrySelection, GTK_STATE_FLAG_SELECTED, StyleColorForeground);
17371737
}
17381738

1739-
Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor() const
1739+
Color RenderThemeGtk::platformActiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options>) const
17401740
{
17411741
return styleColor(ListBox, static_cast<GtkStateFlags>(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED), StyleColorBackground);
17421742
}
@@ -1746,12 +1746,12 @@ Color RenderThemeGtk::platformInactiveListBoxSelectionBackgroundColor(OptionSet<
17461746
return styleColor(ListBox, GTK_STATE_FLAG_SELECTED, StyleColorBackground);
17471747
}
17481748

1749-
Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor() const
1749+
Color RenderThemeGtk::platformActiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const
17501750
{
17511751
return styleColor(ListBox, static_cast<GtkStateFlags>(GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED), StyleColorForeground);
17521752
}
17531753

1754-
Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor() const
1754+
Color RenderThemeGtk::platformInactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options>) const
17551755
{
17561756
return styleColor(ListBox, GTK_STATE_FLAG_SELECTED, StyleColorForeground);
17571757
}

0 commit comments

Comments
 (0)