Skip to content

Conversation

@lilyspiniolas
Copy link
Contributor

@lilyspiniolas lilyspiniolas commented Feb 27, 2025

33a5d09

Add Mac style menulist-button appearance for Catalyst
https://bugs.webkit.org/show_bug.cgi?id=288733
rdar://145672619

Reviewed by Aditya Keerthi.

Allow Catalyst to paint menulist-buttons when using
Mac-style controls, and to adjust CSS styles accordingly.
Removed a few unused variables from RenderThemeIOS.
Updated codepath for focus ring support on Catalyst.

* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint):
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::paintMenuListButton):
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.h:
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm:
(WebCore::RenderThemeCocoa::paintMenuListButton):
(WebCore::RenderThemeCocoa::supportsFocusRing const):
* Source/WebCore/rendering/ios/RenderThemeIOS.mm:
(WebCore::applyCommonButtonPaddingToStyle):
(WebCore::adjustInputElementButtonStyle):
(WebCore::RenderThemeIOS::adjustMenuListButtonStyle const):
(WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
(WebCore::RenderThemeIOS::supportsFocusRing const):

Canonical link: https://commits.webkit.org/291291@main

6f6e004

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style 🛠 ios ✅ 🛠 mac 🛠 wpe 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2 🧪 win-tests
✅ 🧪 webkitperl 🧪 ios-wk2 🧪 api-mac 🧪 api-wpe
🧪 ios-wk2-wpt 🧪 mac-wk1 🛠 wpe-cairo
🧪 api-ios 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision 🧪 mac-AS-debug-wk2 🧪 gtk-wk2
🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
⏳ 🧪 vision-wk2 🧪 mac-intel-wk2 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv 🛠 mac-safer-cpp
🛠 tv-sim
🛠 watch
✅ 🛠 watch-sim

@lilyspiniolas lilyspiniolas self-assigned this Feb 27, 2025
@lilyspiniolas lilyspiniolas added the New Bugs Unclassified bugs are placed in this component until the correct component can be determined. label Feb 27, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 27, 2025
@lilyspiniolas lilyspiniolas removed the merging-blocked Applied to prevent a change from being merged label Feb 27, 2025
Comment on lines 603 to 604
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm we've normally been checking the setting in the condition and then return RenderThemeCocoa:: inside.

@lilyspiniolas lilyspiniolas added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 28, 2025
https://bugs.webkit.org/show_bug.cgi?id=288733
rdar://145672619

Reviewed by Aditya Keerthi.

Allow Catalyst to paint menulist-buttons when using
Mac-style controls, and to adjust CSS styles accordingly.
Removed a few unused variables from RenderThemeIOS.
Updated codepath for focus ring support on Catalyst.

* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paint):
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::paintMenuListButton):
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.h:
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm:
(WebCore::RenderThemeCocoa::paintMenuListButton):
(WebCore::RenderThemeCocoa::supportsFocusRing const):
* Source/WebCore/rendering/ios/RenderThemeIOS.mm:
(WebCore::applyCommonButtonPaddingToStyle):
(WebCore::adjustInputElementButtonStyle):
(WebCore::RenderThemeIOS::adjustMenuListButtonStyle const):
(WebCore::RenderThemeIOS::paintMenuListButtonDecorations):
(WebCore::RenderThemeIOS::supportsFocusRing const):

Canonical link: https://commits.webkit.org/291291@main
@webkit-commit-queue
Copy link
Collaborator

Committed 291291@main (33a5d09): https://commits.webkit.org/291291@main

Reviewed commits have been landed. Closing PR #41530 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 33a5d09 into WebKit:main Feb 28, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

New Bugs Unclassified bugs are placed in this component until the correct component can be determined.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants