Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Fix overflow for URL autocomplete on Windows #4582

Merged
merged 1 commit into from
Oct 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions js/components/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,7 @@ class Main extends ImmutableComponent {
enableNoScript={this.enableNoScript(activeSiteSettings)}
settings={this.props.appState.get('settings')}
noScriptIsVisible={noScriptIsVisible}
menubarVisible={customTitlebar.menubarVisible}
/>
<div className='topLevelEndButtons'>
<div className={cx({
Expand Down
1 change: 1 addition & 0 deletions js/components/navigationBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class NavigationBar extends ImmutableComponent {
endLoadTime={this.props.endLoadTime}
titleMode={this.titleMode}
urlbar={this.props.navbar.get('urlbar')}
menubarVisible={this.props.menubarVisible}
/>
{
isSourceAboutUrl(this.props.location)
Expand Down
3 changes: 2 additions & 1 deletion js/components/urlBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,8 @@ class UrlBar extends ImmutableComponent {
urlLocation={this.props.urlbar.get('location')}
urlPreview={this.props.urlbar.get('urlPreview')}
searchSelectEntry={this.searchSelectEntry}
previewActiveIndex={this.props.previewActiveIndex || 0} />
previewActiveIndex={this.props.previewActiveIndex || 0}
menubarVisible={this.props.menubarVisible} />
: null
}
</form>
Expand Down
3 changes: 2 additions & 1 deletion js/components/urlBarSuggestions.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ class UrlBarSuggestions extends ImmutableComponent {
addToItems(searchSuggestions, 'searchTitle', locale.translation('searchSuggestionTitle'), 'fa-search')
addToItems(topSiteSuggestions, 'topSiteTitle', locale.translation('topSiteSuggestionTitle'), 'fa-link')
const documentHeight = Number.parseInt(window.getComputedStyle(document.querySelector(':root')).getPropertyValue('--navbar-height'), 10)
const menuHeight = this.props.menubarVisible ? 30 : 0
return <ul className='urlBarSuggestions' style={{
maxHeight: document.documentElement.offsetHeight - documentHeight - 2
maxHeight: document.documentElement.offsetHeight - documentHeight - 2 - menuHeight
}}>
{items}
</ul>
Expand Down
5 changes: 0 additions & 5 deletions less/navigationBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
box-sizing: border-box;
}

.navbarMenubarFlexContainer {
padding-left: 5px;
padding-top: 5px;
}

#urlInput { width: 100%; }

// changes to ensure window can be as small as 480px wide
Expand Down