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

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

Use menubar item color (not menu item color).
Closes electron#15194
@codebytere
Copy link
Member

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

Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix!

@Cobinja
Copy link

Cobinja 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
@release-clerk
Copy link

release-clerk bot commented Nov 30, 2018

Release Notes Persisted

Fixes incorrect foreground color on GTK menubar

@codebytere
Copy link
Member

@inukshuk can you open manual backports?

@trop
Copy link
Contributor

trop bot 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
Copy link
Contributor

trop bot 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
Copy link
Contributor

trop bot 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
Copy link
Contributor Author

inukshuk 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
Copy link

Cobinja 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
Labels
None yet
Projects
No open projects
3.0.x / 3.1.x
Fixed (3.0.14)
3.1.x
Fixed in 3.1.1
Development

Successfully merging this pull request may close these issues.

None yet

4 participants