Skip to content
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
merged 1 commit into from
Sep 22, 2016
Merged

Fix titlebar menu + titlebar resize issues #4203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/renderer/components/windowCaptionButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' : '')}>
Copy link
Member

Choose a reason for hiding this comment

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

ewww :) Pls change this to use cx for classSet in a followup

<div className={'container ' + this.osClass}>
<button
className={this.buttonClass + ' captionButton minimize'}
Expand Down
10 changes: 7 additions & 3 deletions js/components/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,8 @@ class Main extends ImmutableComponent {
!autofillCreditCardPanelIsVisible &&
!releaseNotesIsVisible &&
!noScriptIsVisible &&
activeFrame && !activeFrame.getIn(['security', 'loginRequiredDetail'])
activeFrame && !activeFrame.getIn(['security', 'loginRequiredDetail']) &&
!customTitlebar.menubarSelectedIndex

return <div id='window'
className={cx({
Expand Down Expand Up @@ -868,7 +869,10 @@ class Main extends ImmutableComponent {
<div className='navbarMenubarBlockContainer'>
{
customTitlebar.menubarVisible
? <div className='menubarContainer'>
? <div className={cx({
Copy link
Member

Choose a reason for hiding this comment

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

yes like this one...

allowDragging: shouldAllowWindowDrag,
menubarContainer: true
})}>
<Menubar
template={customTitlebar.menubarTemplate}
selectedIndex={customTitlebar.menubarSelectedIndex}
Expand Down Expand Up @@ -939,7 +943,7 @@ class Main extends ImmutableComponent {
</div>
{
customTitlebar.captionButtonsVisible
? <WindowCaptionButtons windowMaximized={customTitlebar.isMaximized} />
? <WindowCaptionButtons windowMaximized={customTitlebar.isMaximized} shouldAllowWindowDrag={shouldAllowWindowDrag} />
: null
}
</div>
Expand Down
58 changes: 44 additions & 14 deletions less/navigationBar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,23 @@
.loadTime { display: none; }
#urlInput { max-width: 75px; }
#titleBar { width: 100px; }
.menubarContainer {
.menubar {
.menubarItem {
padding: 0 5px 1px;
}
}
}
}
@media (max-width: @breakpointTinyWin32) {
#urlInput { max-width: 50px; }
.menubarContainer {
.menubar {
.menubarItem {
padding: 0 3px 1px;
}
}
}
}
}

Expand All @@ -83,7 +97,15 @@
// Window Caption Buttons (for use w/ slim titlebar)
.windowCaptionButtons {
display: inline-block;
-webkit-app-region: drag;

&.allowDragging {
-webkit-app-region: drag;
>* {
-webkit-app-region: no-drag;
}
}

white-space: nowrap;

.hidden {
display: none;
Expand Down Expand Up @@ -111,18 +133,18 @@
outline: 0;
height: 18px;
color: #b1acac;
border: 1px solid #838383;
border: 1px solid #adadad;
border-top: 0;
display: inline-block;
background-color: #e0e0e0;
background-color: #f5f5f5;
box-shadow: inset 1px 1px rgba(255, 255, 255, 0.9);
width: 25px;

&.minimize {
width: 28px;
border-right: 0px;
&:hover {
background-color: #f5f5f5;
background-color: #fff;
}
&:active {
background-color: #cacacb;
Expand All @@ -133,7 +155,7 @@
width: 10px;
height: 3px;
border: 1px solid #838383;
background: #fefefe;
background: #fff;
display: inline-block;
border-radius: 1px;
}
Expand All @@ -143,10 +165,10 @@
border-right: 0px;
width: 27px;
&:hover {
background-color: #f5f5f5;
background-color: #fff;
.widget {
.widget2 {
background-color: #f5f5f5;
background-color: #fff;
}
}
}
Expand Down Expand Up @@ -176,15 +198,15 @@
height: 8px;
top: -5px;
left: 6px;
background: #fefefe;
background: #fff;
border-radius: 1px;
}
.widget3 {
display: inline-block;
width: 2px;
height: 2px;
border: 1px solid #838383;
background: #fefefe;
background: #fff;
position: relative;
top: -20px;
left: -2px;
Expand All @@ -197,7 +219,7 @@
width: 10px;
height: 8px;
border: 1px solid #838383;
background: #fefefe;
background: #fff;
position: relative;
top: 2px;
left: 7px;
Expand All @@ -207,7 +229,7 @@
width: 4px;
height: 2px;
border: 1px solid #838383;
background-color: #e0e0e0;
background-color: #f5f5f5;
position: relative;
top: -5px;
left: 10px;
Expand Down Expand Up @@ -269,6 +291,8 @@
background: black;
display: inline-block;
vertical-align: middle;
position: relative;
left: -1px;
}
}

Expand Down Expand Up @@ -386,8 +410,8 @@
display: inline-block;
transform: rotate(315deg);
position: relative;
top: -21px;
left: -2px;
top: -6px;
left: -16px;
}
.widget3 { display: none; }
}
Expand All @@ -398,13 +422,19 @@

// Menubar (for use w/ slim titlebar)
.menubarContainer {
-webkit-app-region: drag;
width: 100%;
height: 29px;
display: inline-block;
margin-top: 5px;
margin-left: 4px;

&.allowDragging {
-webkit-app-region: drag;
>* {
-webkit-app-region: no-drag;
}
}

.menubar {
display: inline-block;
cursor: default;
Expand Down