This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
Fix titlebar menu + titlebar resize issues #4203
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ves as draggable when they are allowed to be dragged and then remove that style when they shouldn't be (for example, when a modal is showing or a context menu is being displayed). Huge thanks to @bbondy for the assist :) Fixes #4142 - Menu gets compressed nicely when making small (less padding). Caption buttons no longer wrap Fixes #4185 Updated Windows 7 colors w/ @bradleyrichter
bbondy
reviewed
Sep 22, 2016
| @@ -55,7 +55,7 @@ class WindowCaptionButtons extends ImmutableComponent { | |||
| } | |||
|
|
|||
| render () { | |||
| return <div className={this.buttonClass + ' windowCaptionButtons'}> | |||
| return <div className={this.buttonClass + ' windowCaptionButtons' + (this.props.shouldAllowWindowDrag ? ' allowDragging' : '')}> | |||
There was a problem hiding this comment.
ewww :) Pls change this to use cx for classSet in a followup
| @@ -868,7 +869,10 @@ class Main extends ImmutableComponent { | |||
| <div className='navbarMenubarBlockContainer'> | |||
| { | |||
| customTitlebar.menubarVisible | |||
| ? <div className='menubarContainer'> | |||
| ? <div className={cx({ | |||
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git rebase -ito squash commits (if needed).…ves as draggable when they are allowed to be dragged
and then remove that style when they shouldn't be (for example, when a modal is showing or a context menu is being displayed).
Huge thanks to @bbondy for the assist :)
Fixes #4142
Fixes System buttons on window should not be wrapped #4185
Updated Windows 7 colors w/ @bradleyrichter
Auditors: @bbondy
Test Plan:
for #4142
for #4185
Titlebar on Windows has a lot of wasted space #3036