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

fix: get foreground color from GtkMenubar#menubar #15878

Merged
merged 1 commit into from Nov 30, 2018

Conversation

@inukshuk
Copy link
Contributor

commented Nov 29, 2018

Description of Change

Resolves #15194

This pulls the GTK menubar item's color from the theme's menubar item foreground. Previously, the menu item's color was used, which could cause issues with some themes (e.g., see the screenshot below using the Yaru theme, which is default in the latest version of Ubuntu):

screenshot from 2018-11-29 11-28-14

screenshot from 2018-11-29 11-28-03

cc @codebytere

Checklist

  • PR description included and stakeholders cc'd
  • npm test passes
  • PR title follows semantic commit guidelines

Release Notes

Notes: Fixes incorrect foreground color on GTK menubar

Fix GTK menubar item color
Use menubar item color (not menu item color).
Closes #15194
@codebytere

This comment has been minimized.

Copy link
Member

commented Nov 29, 2018

Looks good to me as it stands, although ill wait for a few more linux people to give it some eyes :)

@ckerr

ckerr approved these changes Nov 29, 2018

Copy link
Member

left a comment

LGTM. Thanks for the fix!

@Cobinja

This comment has been minimized.

Copy link

commented Nov 30, 2018

Tested with themes CobiBird, Adwaita and Adwaita Dark. Seems to work fine.

@codebytere codebytere merged commit 2e91bf1 into electron:master Nov 30, 2018

22 of 26 checks passed

Backportable? - 3-0-x Backport Failed
Details
Backportable? - 3-1-x Backport Failed
Details
Backportable? - 4-0-x Backport Failed
Details
ci/circleci: mas-testing-tests Your tests failed on CircleCI
Details
Absolute Zero
Artifact Comparison No Changes
Details
Semantic Pull Request ready to be squashed
Details
WIP Legacy commit status override — see details
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
ci/circleci: linux-arm-debug Your tests passed on CircleCI!
Details
ci/circleci: linux-arm-testing Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-debug Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-testing Your tests passed on CircleCI!
Details
ci/circleci: linux-checkout Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-debug Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-testing Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-testing-tests Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-debug Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-testing Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-testing-tests Your tests passed on CircleCI!
Details
ci/circleci: mas-testing Your tests passed on CircleCI!
Details
ci/circleci: osx-testing Your tests passed on CircleCI!
Details
ci/circleci: osx-testing-tests Your tests passed on CircleCI!
Details
electron-lint Build #20181129.8 succeeded
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

commented Nov 30, 2018

Release Notes Persisted

Fixes incorrect foreground color on GTK menubar

@codebytere

This comment has been minimized.

Copy link
Member

commented Nov 30, 2018

@inukshuk can you open manual backports?

@trop

This comment has been minimized.

Copy link
Contributor

commented Nov 30, 2018

I was unable to backport this PR to "4-0-x" cleanly;
you will need to perform this backport manually.

@trop

This comment has been minimized.

Copy link
Contributor

commented Nov 30, 2018

I was unable to backport this PR to "3-1-x" cleanly;
you will need to perform this backport manually.

@trop

This comment has been minimized.

Copy link
Contributor

commented Nov 30, 2018

I was unable to backport this PR to "3-0-x" cleanly;
you will need to perform this backport manually.

@inukshuk

This comment has been minimized.

Copy link
Contributor Author

commented Dec 3, 2018

@codebytere I'd be happy to. Does that mean opening separate PRs in the 4-0-x, 3-1-x and 3-0-x branches? And backport the patch change to libcc I guess? Thanks for your help!

@Cobinja

This comment has been minimized.

Copy link

commented Jan 1, 2019

@codebytere Should this be backported to 2-0-x as well, or just starting with 3-0-x? Asking because you backported the menubar background color thingy to 2-0-x but this PR only got tagged beginning with 3-0-x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.