Merge pull request #4296 from bsclifton/draggable_fixes

Fixed draggable areas of window.
brave · Sep 27, 2016 · 10a4613 · 10a4613
2 parents 0d59cba + 2aae438
commit 10a4613
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # Logs
 logs
 *.log
+npm-debug.log.*
 
 # Runtime data
 pids

diff --git a/app/renderer/components/windowCaptionButtons.js b/app/renderer/components/windowCaptionButtons.js
@@ -104,10 +104,6 @@ class WindowCaptionButtons extends ImmutableComponent {
           </div>
         </button>
       </div>
-      <div className={cx({
-        deadArea: true,
-        allowDragging: this.props.shouldAllowWindowDrag
-      })} />
     </div>
   }
 }

diff --git a/js/components/main.js b/js/components/main.js
@@ -870,7 +870,10 @@ class Main extends ImmutableComponent {
         : null
       }
       <div className='top'>
-        <div className='navbarCaptionButtonContainer'>
+        <div className={cx({
+            navbarCaptionButtonContainer: true,
+            allowDragging: shouldAllowWindowDrag
+          })}>
           <div className='navbarMenubarFlexContainer'>
             {
               customTitlebar.menubarVisible
@@ -881,10 +884,6 @@ class Main extends ImmutableComponent {
                     contextMenuDetail={this.props.windowState.get('contextMenuDetail')}
                     autohide={getSetting(settings.AUTO_HIDE_MENU)}
                     lastFocusedSelector={customTitlebar.lastFocusedSelector} />
-                  <div className={cx({
-                    deadArea: true,
-                    allowDragging: shouldAllowWindowDrag
-                  })} />
                 </div>
                 : null
             }
@@ -933,7 +932,7 @@ class Main extends ImmutableComponent {
               />
               <div className='topLevelEndButtons'>
                 <div className={cx({
-                  deadArea: true,
+                  extraDragArea: true,
                   allowDragging: shouldAllowWindowDrag
                 })} />
                 {
@@ -952,7 +951,7 @@ class Main extends ImmutableComponent {
           </div>
           {
             customTitlebar.captionButtonsVisible
-              ? <WindowCaptionButtons windowMaximized={customTitlebar.isMaximized} shouldAllowWindowDrag={shouldAllowWindowDrag} />
+              ? <WindowCaptionButtons windowMaximized={customTitlebar.isMaximized} />
               : null
           }
         </div>
@@ -1052,7 +1051,7 @@ class Main extends ImmutableComponent {
         }
         <div className={cx({
           tabPages: true,
-          allowDragging: shouldAllowWindowDrag && !isWindows,
+          allowDragging: shouldAllowWindowDrag,
           singlePage: nonPinnedFrames.size <= tabsPerPage
         })}
           onContextMenu={this.onTabContextMenu}>
@@ -1067,7 +1066,7 @@ class Main extends ImmutableComponent {
         </div>
         <TabsToolbar
           paintTabs={getSetting(settings.PAINT_TABS)}
-          shouldAllowWindowDrag={shouldAllowWindowDrag && !isWindows}
+          shouldAllowWindowDrag={shouldAllowWindowDrag}
           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}

diff --git a/less/navigationBar.less b/less/navigationBar.less
@@ -51,7 +51,7 @@
   // changes to ensure window can be as small as 480px wide
   // and still be useable and have the caption buttons intact
   @media (max-width: @breakpointExtensionButtonPadding) {
-    .navigatorWrapper .topLevelEndButtons .deadArea {
+    .navigatorWrapper .topLevelEndButtons .extraDragArea {
       width: 0;
     }
   }
@@ -81,6 +81,10 @@
 .navbarCaptionButtonContainer {
   display: flex;
   border-bottom: 1px solid #aaaaaa;
+
+  &.allowDragging {
+    -webkit-app-region: drag;
+  }
 }
 .navbarMenubarFlexContainer {
   display: flex;
@@ -100,7 +104,6 @@
 .windowCaptionButtons {
   display: flex;
   flex-direction: column;
-
   white-space: nowrap;
 
   .hidden {
@@ -121,6 +124,7 @@
   .container {
     display: flex;
     flex-grow: 0;
+    -webkit-app-region: no-drag;
   }
 
   .win7 {
@@ -415,17 +419,6 @@
       }
     }
   }
-
-  .deadArea {
-    display: flex;
-    flex-grow:1;
-    &.allowDragging {
-      -webkit-app-region: drag;
-      >* {
-        -webkit-app-region: no-drag;
-      }
-    }
-  }
 }
 
 // Menubar (for use w/ slim titlebar)
@@ -459,17 +452,6 @@
       border: 1px solid #99d1ff !important;
     }
   }
-  .deadArea {
-    display: flex;
-    flex-grow: 1;
-
-    &.allowDragging {
-      -webkit-app-region: drag;
-      >* {
-        -webkit-app-region: no-drag;
-      }
-    }
-  }
 }
 
 // Here I grouped the rules to keep the layout of the top bar consistent.
@@ -535,6 +517,10 @@
     display: flex;
     flex-direction: row;
 
+    .extensionButton {
+      -webkit-app-region: no-drag;
+    }
+
     .braveMenu {
       width: @navbarBraveButtonWidth;
       margin-right: @navbarButtonSpacing;
@@ -555,17 +541,10 @@
       }
     }
 
-    .deadArea {
+    .extraDragArea {
       display: flex;
       flex-grow: 0;
       width: @navbarBraveButtonMarginLeft;
-
-      &.allowDragging {
-        -webkit-app-region: drag;
-        >* {
-          -webkit-app-region: no-drag;
-        }
-      }
     }
   }
 }