Merge pull request #4628 from bsclifton/fix-alt-gr-titlebar

Update Windows titlebar code to ignore AltGr

app/common/constants/keyLocations.js

@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const keyLocations = {
+  DOM_KEY_LOCATION_STANDARD: 0,
+  DOM_KEY_LOCATION_LEFT: 1,
+  DOM_KEY_LOCATION_RIGHT: 2,
+  DOM_KEY_LOCATION_STANDARD: 3,
+}
+
+module.exports = keyLocations

app/renderer/components/menubar.js

@@ -7,7 +7,7 @@ const Immutable = require('immutable')
 const ImmutableComponent = require('../../../js/components/immutableComponent')
 const windowActions = require('../../../js/actions/windowActions')
 const separatorMenuItem = require('../../common/commonMenu').separatorMenuItem
-const keyCodes = require('../../../js/constants/keyCodes')
+const keyCodes = require('../../common/constants/keyCodes')
 const {wrappingClamp} = require('../../common/lib/formatUtil')
 
 const bindClickHandler = (contextMenu, lastFocusedSelector) => {

js/components/addEditBookmark.js

@@ -8,7 +8,7 @@ const Dialog = require('./dialog')
 const Button = require('./button')
 const windowActions = require('../actions/windowActions')
 const appActions = require('../actions/appActions')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 const siteTags = require('../constants/siteTags')
 const settings = require('../constants/settings')
 const siteUtil = require('../state/siteUtil')

js/components/autofillAddressPanel.js

@@ -8,7 +8,7 @@ const Dialog = require('./dialog')
 const Button = require('./button')
 const windowActions = require('../actions/windowActions')
 const appActions = require('../actions/appActions')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 
 class AutofillAddressPanel extends ImmutableComponent {
   constructor () {

js/components/autofillCreditCardPanel.js

@@ -8,7 +8,7 @@ const Dialog = require('./dialog')
 const Button = require('./button')
 const windowActions = require('../actions/windowActions')
 const appActions = require('../actions/appActions')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 
 class AutofillCreditCardPanel extends ImmutableComponent {
   constructor () {

js/components/contextMenu.js

@@ -7,7 +7,7 @@ const Immutable = require('immutable')
 const ImmutableComponent = require('./immutableComponent')
 const windowActions = require('../actions/windowActions')
 const cx = require('../lib/classSet')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 const {formatAccelerator} = require('../../app/common/lib/formatUtil')
 const separatorMenuItem = require('../../app/common/commonMenu').separatorMenuItem
 

js/components/dialog.js

@@ -4,7 +4,7 @@
 
 const React = require('react')
 const ImmutableComponent = require('./immutableComponent')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 
 /**
  * Represents a popup dialog

js/components/findbar.js

@@ -5,7 +5,7 @@
 const React = require('react')
 const ImmutableComponent = require('./immutableComponent')
 const Immutable = require('immutable')
-const keyCodes = require('../constants/keyCodes')
+const keyCodes = require('../../app/common/constants/keyCodes')
 const Button = require('./button')
 const SwitchControl = require('../components/switchControl')
 const windowActions = require('../actions/windowActions')

js/components/loginRequired.js

@@ -6,7 +6,7 @@ const React = require('react')
 const Dialog = require('./dialog')
 const Button = require('./button')
 const appActions = require('../actions/appActions')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 const url = require('url')
 
 class LoginRequired extends React.Component {

js/components/main.js

@@ -50,7 +50,8 @@ const messages = require('../constants/messages')
 const settings = require('../constants/settings')
 const siteTags = require('../constants/siteTags')
 const dragTypes = require('../constants/dragTypes')
-const keyCodes = require('../constants/keyCodes')
+const keyCodes = require('../../app/common/constants/keyCodes')
+const keyLocations = require('../../app/common/constants/keyLocations')
 const isWindows = process.platform === 'win32'
 
 // State handling
@@ -131,6 +132,11 @@ class Main extends ImmutableComponent {
         const customTitlebar = this.customTitlebar
         switch (e.which) {
           case keyCodes.ALT:
+            // Ignore right alt (AltGr)
+            if (e.location === keyLocations.DOM_KEY_LOCATION_RIGHT) {
+              break
+            }
+
             e.preventDefault()
 
             if (getSetting(settings.AUTO_HIDE_MENU)) {

js/components/popupWindow.js

@@ -6,7 +6,7 @@ const React = require('react')
 const ReactDOM = require('react-dom')
 const ImmutableComponent = require('./immutableComponent')
 const cx = require('../lib/classSet')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 const windowActions = require('../actions/windowActions')
 
 /**

js/components/urlBar.js

@@ -8,7 +8,7 @@ const urlParse = require('url').parse
 const ImmutableComponent = require('./immutableComponent')
 const windowActions = require('../actions/windowActions')
 const appActions = require('../actions/appActions')
-const KeyCodes = require('../constants/keyCodes')
+const KeyCodes = require('../../app/common/constants/keyCodes')
 const cx = require('../lib/classSet')
 const ipc = global.require('electron').ipcRenderer