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

Backport scrubber width fix to 1-7-x #11141

Merged
merged 3 commits into from Nov 17, 2017

Conversation

Projects
None yet
4 participants
@MarshallOfSound
Member

MarshallOfSound commented Nov 16, 2017

No description provided.

Make ScrubberItem width dynamic
Depending on whether a ScrubberItem has text or an icon, this changeset
calculates the actual width and sizes the TouchBar items accordingly.
Previously, all ScrubberItems, regardless of their content, had a static
width of 50px.

This commit also fixes #10539.

@MarshallOfSound MarshallOfSound requested review from electron/browserview as code owners Nov 16, 2017

@MarshallOfSound MarshallOfSound changed the base branch from master to 1-7-x Nov 16, 2017

MarshallOfSound and others added some commits Nov 8, 2017

@ckerr

ckerr approved these changes Nov 17, 2017

LGTM

@ckerr ckerr merged commit 75ff5d2 into 1-7-x Nov 17, 2017

6 checks passed

ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/jenkins/branch This commit looks good
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details

@ckerr ckerr deleted the backport-scrubber-width-fix branch Nov 17, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment