From 79b93e12615d53bace8e4e7fccf175069fe9ef91 Mon Sep 17 00:00:00 2001
From: Pete Miller <miller.pete+commit@gmail.com>
Date: Tue, 16 Jan 2018 22:45:56 -0800
Subject: [PATCH] Restore disabled dragging and context menu for Bookmarks Bar
 on Windows

Previously it was enough to not add 'drag' to the bookmarks bar on Windows, but now that it is added at a higher level in the DOM (so that dragging works in the margin between the bars) via #10512, we have to explicitly set it to 'no-drag' on each child.

Fix #11728
---
 app/renderer/components/bookmarks/bookmarksToolbar.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/renderer/components/bookmarks/bookmarksToolbar.js b/app/renderer/components/bookmarks/bookmarksToolbar.js
index 4417d94559d..1608a3e0187 100644
--- a/app/renderer/components/bookmarks/bookmarksToolbar.js
+++ b/app/renderer/components/bookmarks/bookmarksToolbar.js
@@ -178,8 +178,7 @@ class BookmarksToolbar extends React.Component {
     // used in renderer
     props.showOnlyFavicon = bookmarkUtil.showOnlyFavicon()
     props.showFavicon = bookmarkUtil.showFavicon()
-    props.shouldAllowWindowDrag = windowState.shouldAllowWindowDrag(state, currentWindow, activeFrame, isFocused(state)) &&
-      !isWindows
+    props.shouldAllowWindowDrag = !isWindows && windowState.shouldAllowWindowDrag(state, currentWindow, activeFrame, isFocused(state))
     props.visibleBookmarks = bookmarkToolbarState.getToolbar(state, currentWindowId)
     props.hiddenBookmarks = bookmarkToolbarState.getOther(state, currentWindowId)
 
@@ -196,6 +195,7 @@ class BookmarksToolbar extends React.Component {
     return <div className={css(
       styles.bookmarksToolbar,
       this.props.shouldAllowWindowDrag && styles.bookmarksToolbar_allowDragging,
+      !this.props.shouldAllowWindowDrag && styles.bookmarksToolbar_disallowDragging,
       this.props.showOnlyFavicon && styles.bookmarksToolbar_showOnlyFavicon
     )}
       data-test-id='bookmarksToolbar'
@@ -242,6 +242,10 @@ const styles = StyleSheet.create({
     WebkitAppRegion: 'drag'
   },
 
+  bookmarksToolbar_disallowDragging: {
+    WebkitAppRegion: 'no-drag'
+  },
+
   bookmarksToolbar_showOnlyFavicon: {
     padding: `0 0 0 ${globalStyles.spacing.bookmarksToolbarPadding}`
   },