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

0.12.2dev titlebar fixes (round 1) #4243

Merged
merged 1 commit into from
Sep 23, 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
6 changes: 3 additions & 3 deletions js/components/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ class Main extends ImmutableComponent {
draggingOverData={this.props.windowState.getIn(['ui', 'dragging', 'draggingOver', 'dragType']) === dragTypes.BOOKMARK && this.props.windowState.getIn(['ui', 'dragging', 'draggingOver'])}
showFavicon={showFavicon}
showOnlyFavicon={showOnlyFavicon}
shouldAllowWindowDrag={shouldAllowWindowDrag}
shouldAllowWindowDrag={shouldAllowWindowDrag && !isWindows}
activeFrameKey={activeFrame && activeFrame.get('key') || undefined}
windowWidth={window.innerWidth}
contextMenuDetail={this.props.windowState.get('contextMenuDetail')}
Expand All @@ -1043,7 +1043,7 @@ class Main extends ImmutableComponent {
}
<div className={cx({
tabPages: true,
allowDragging: shouldAllowWindowDrag,
allowDragging: shouldAllowWindowDrag && !isWindows,
singlePage: nonPinnedFrames.size <= tabsPerPage
})}
onContextMenu={this.onTabContextMenu}>
Expand All @@ -1058,7 +1058,7 @@ class Main extends ImmutableComponent {
</div>
<TabsToolbar
paintTabs={getSetting(settings.PAINT_TABS)}
shouldAllowWindowDrag={shouldAllowWindowDrag}
shouldAllowWindowDrag={shouldAllowWindowDrag && !isWindows}
draggingOverData={this.props.windowState.getIn(['ui', 'dragging', 'draggingOver', 'dragType']) === dragTypes.TAB && this.props.windowState.getIn(['ui', 'dragging', 'draggingOver'])}
previewTabs={getSetting(settings.SHOW_TAB_PREVIEWS)}
tabsPerTabPage={tabsPerPage}
Expand Down
7 changes: 0 additions & 7 deletions less/bookmarksToolbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
--bookmarks-toolbar-padding: 10px;
}

// (Windows) Bookmarks toolbar not right-clickable unless it has no-drag
.platform--win32 .bookmarksToolbar {
&.allowDragging {
-webkit-app-region: no-drag !important;
}
}

.bookmarksToolbar {
background: @toolbarBackground;
border-bottom: 1px solid #aaaaaa;
Expand Down
16 changes: 9 additions & 7 deletions less/contextMenu.less
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,14 @@


// Make context menu style match menubar (Windows only- for use w/ slim titlebar)
.platform--win32 .contextMenuItem {
font: menu;
font-size: 12px;
}
.platform--win32 {
.contextMenuItem {
font: menu;
font-size: 12px;
}

.platform--win32 .accelerator {
font: menu;
font-size: 12px !important;
.accelerator {
font: menu;
font-size: 12px !important;
}
}
7 changes: 0 additions & 7 deletions less/tabs.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@

@import "variables.less";

// (Windows) Tabs row not right-clickable unless it has no-drag
.platform--win32 .tabStripContainer {
&.allowDragging {
-webkit-app-region: no-drag !important;
}
}

.tabs {
background: @tabsBackground;
box-sizing: border-box;
Expand Down