Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GTK] Extraneous empty bar shown in detached inspector windows #28170

Merged
merged 1 commit into from
May 6, 2024

Conversation

aperezdc
Copy link
Contributor

@aperezdc aperezdc commented May 6, 2024

0995cf2

[GTK] Extraneous empty bar shown in detached inspector windows
https://bugs.webkit.org/show_bug.cgi?id=255585

Reviewed by Carlos Garcia Campos.

The WI.undockedTitleAreaHeight() function only returns non-zero values
for Mac, but in Variables.css the --undocked-title-area-height variable
is set always to a non-zero value, the exact value depending on the
MacOS version. Add an :is(.mac-platform) match to leave the value
unchanged from zero in any non-Mac platform to keep the value in sync
with what WI.undockedTitleAreaHeight() returns.

* Source/WebInspectorUI/UserInterface/Views/Variables.css: Only change
  the --undocked-title-area-height variable for Mac.

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

621f212

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  wpe-skia
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ›  gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  tv-sim βœ… πŸ§ͺ mac-wk2-stress βœ… πŸ§ͺ api-gtk
βœ… πŸ›  watch
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@aperezdc aperezdc self-assigned this May 6, 2024
@aperezdc aperezdc added the Web Inspector Bugs related to the WebKit Web Inspector. label May 6, 2024
@aperezdc aperezdc requested a review from a team May 6, 2024 13:15
@aperezdc aperezdc added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing GLib Suggested Backport Suggest this merge request be backported to current WPE/GTK stable branch labels May 6, 2024
https://bugs.webkit.org/show_bug.cgi?id=255585

Reviewed by Carlos Garcia Campos.

The WI.undockedTitleAreaHeight() function only returns non-zero values
for Mac, but in Variables.css the --undocked-title-area-height variable
is set always to a non-zero value, the exact value depending on the
MacOS version. Add an :is(.mac-platform) match to leave the value
unchanged from zero in any non-Mac platform to keep the value in sync
with what WI.undockedTitleAreaHeight() returns.

* Source/WebInspectorUI/UserInterface/Views/Variables.css: Only change
  the --undocked-title-area-height variable for Mac.

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

Committed 278418@main (0995cf2): https://commits.webkit.org/278418@main

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

@webkit-commit-queue webkit-commit-queue merged commit 0995cf2 into WebKit:main May 6, 2024
@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 May 6, 2024
@aperezdc aperezdc deleted the gtk-inspector-topbar branch May 6, 2024 20:36
@aperezdc
Copy link
Contributor Author

aperezdc commented May 6, 2024

Backported into the 2.44 branch as commit 049054f

@aperezdc aperezdc removed the GLib Suggested Backport Suggest this merge request be backported to current WPE/GTK stable branch label May 6, 2024
@@ -424,7 +424,7 @@ body {
}
}

&:not(.mac-platform.monterey, .mac-platform.big-sur):not(.docked) {
&:is(.mac-platform):not(.mac-platform.monterey, .mac-platform.big-sur):not(.docked) {
Copy link
Member

Choose a reason for hiding this comment

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

i feel like this would be better written as

&:is(.mac-platform):not(.monterey, .big-sur):not(.docked) {

or even more ideally as

&:is(.mac-platform.catalina):not(.docked) {

since i dont think we support anything before macOS 10.15 Catalina

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dcrousso I'll send a follow-up, for this I tried to apply only the smallest change that would avoid applying the non-zero size to non-Mac platforms.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dcrousso I'll send a follow-up, for this I tried to apply only the smallest change that would avoid applying the non-zero size to non-Mac platforms.

Done, PR at #28287

I saw still references to Mojave in the code, so I kept it in the selector.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Web Inspector Bugs related to the WebKit Web Inspector.
Projects
None yet
5 participants