Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview | 6 * @fileoverview |
| 7 * 'settings-display-overscan-dialog' is the dialog for display overscan | 7 * 'settings-display-overscan-dialog' is the dialog for display overscan |
| 8 * adjustments. | 8 * adjustments. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 comitted_: Boolean, | 23 comitted_: Boolean, |
| 24 }, | 24 }, |
| 25 | 25 |
| 26 /** | 26 /** |
| 27 * Keyboard event handler for overscan adjustments. | 27 * Keyboard event handler for overscan adjustments. |
| 28 * @type {?function(!Event)} | 28 * @type {?function(!Event)} |
| 29 * @private | 29 * @private |
| 30 */ | 30 */ |
| 31 keyHandler_: null, | 31 keyHandler_: null, |
| 32 | 32 |
| 33 /** @override */ | 33 open: function() { |
| 34 attached: function() { | |
| 35 this.keyHandler_ = this.handleKeyEvent_.bind(this); | 34 this.keyHandler_ = this.handleKeyEvent_.bind(this); |
| 36 window.addEventListener('keydown', this.keyHandler_); | 35 this.addEventListener('keydown', this.keyHandler_); |
| 37 }, | |
| 38 | |
| 39 /** @override */ | |
| 40 detached: function() { | |
| 41 window.removeEventListener('keydown', this.keyHandler_); | |
| 42 }, | |
| 43 | |
| 44 open: function() { | |
| 45 this.comitted_ = false; | 36 this.comitted_ = false; |
| 46 this.$.dialog.showModal(); | 37 this.$.dialog.showModal(); |
| 47 }, | 38 }, |
| 48 | 39 |
| 49 close: function() { | 40 close: function() { |
| 41 this.removeEventListener('keydown', this.keyHandler_); | |
| 42 | |
| 50 this.displayId = ''; // Will trigger displayIdChanged_. | 43 this.displayId = ''; // Will trigger displayIdChanged_. |
| 51 | 44 |
| 52 if (this.$.dialog.open) | 45 if (this.$.dialog.open) |
| 53 this.$.dialog.close(); | 46 this.$.dialog.close(); |
| 54 }, | 47 }, |
| 55 | 48 |
| 56 /** @private */ | 49 /** @private */ |
| 57 displayIdChanged_: function(newValue, oldValue) { | 50 displayIdChanged_: function(newValue, oldValue) { |
| 58 if (oldValue && !this.comitted_) { | 51 if (oldValue && !this.comitted_) { |
| 59 settings.display.systemDisplayApi.overscanCalibrationReset(oldValue); | 52 settings.display.systemDisplayApi.overscanCalibrationReset(oldValue); |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 76 this.displayId); | 69 this.displayId); |
| 77 this.comitted_ = true; | 70 this.comitted_ = true; |
| 78 this.close(); | 71 this.close(); |
| 79 }, | 72 }, |
| 80 | 73 |
| 81 /** | 74 /** |
| 82 * @param {Event} event | 75 * @param {Event} event |
| 83 * @private | 76 * @private |
| 84 */ | 77 */ |
| 85 handleKeyEvent_: function(event) { | 78 handleKeyEvent_: function(event) { |
| 79 if (event.altKey || event.ctrlKey || event.metaKey) | |
| 80 return; | |
| 86 switch (event.keyCode) { | 81 switch (event.keyCode) { |
| 87 case 37: // left arrow | 82 case 37: // left arrow |
| 88 if (event.shiftKey) | 83 if (event.shiftKey) |
| 89 this.move_(-1, 0); | 84 this.move_(-1, 0); |
| 90 else | 85 else |
| 91 this.resize_(1, 0); | 86 this.resize_(1, 0); |
| 92 break; | 87 break; |
| 93 case 38: // up arrow | 88 case 38: // up arrow |
| 94 if (event.shiftKey) | 89 if (event.shiftKey) |
| 95 this.move_(0, -1); | 90 this.move_(0, -1); |
| 96 else | 91 else |
| 97 this.resize_(0, -1); | 92 this.resize_(0, -1); |
| 98 break; | 93 break; |
| 99 case 39: // right arrow | 94 case 39: // right arrow |
| 100 if (event.shiftKey) | 95 if (event.shiftKey) |
| 101 this.move_(1, 0); | 96 this.move_(1, 0); |
| 102 else | 97 else |
| 103 this.resize_(-1, 0); | 98 this.resize_(-1, 0); |
| 104 break; | 99 break; |
| 105 case 40: // down arrow | 100 case 40: // down arrow |
| 106 if (event.shiftKey) | 101 if (event.shiftKey) |
| 107 this.move_(0, 1); | 102 this.move_(0, 1); |
| 108 else | 103 else |
| 109 this.resize_(0, 1); | 104 this.resize_(0, 1); |
| 110 break; | 105 break; |
| 111 default: | 106 default: |
| 112 return; | 107 return; |
| 113 } | 108 } |
| 114 event.preventDefault(); | 109 event.preventDefault(); |
|
Dan Beam
2016/09/28 18:15:45
you don't really want to do this either. I think
stevenjb
2016/09/28 18:21:29
Thus the 'default: return;' ...
Dan Beam
2016/09/28 18:31:15
ah, OK
if it's a useful signal: I obviously didn'
stevenjb
2016/09/28 18:35:30
I've tested the code if that's what you're asking?
| |
| 115 }, | 110 }, |
| 116 | 111 |
| 117 /** | 112 /** |
| 118 * @param {number} x | 113 * @param {number} x |
| 119 * @param {number} y | 114 * @param {number} y |
| 120 * @private | 115 * @private |
| 121 */ | 116 */ |
| 122 move_: function(x, y) { | 117 move_: function(x, y) { |
| 123 /** @type {!chrome.system.display.Insets} */ var delta = { | 118 /** @type {!chrome.system.display.Insets} */ var delta = { |
| 124 left: x, | 119 left: x, |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 139 /** @type {!chrome.system.display.Insets} */ var delta = { | 134 /** @type {!chrome.system.display.Insets} */ var delta = { |
| 140 left: x, | 135 left: x, |
| 141 top: y, | 136 top: y, |
| 142 right: x, | 137 right: x, |
| 143 bottom: y, | 138 bottom: y, |
| 144 }; | 139 }; |
| 145 settings.display.systemDisplayApi.overscanCalibrationAdjust( | 140 settings.display.systemDisplayApi.overscanCalibrationAdjust( |
| 146 this.displayId, delta); | 141 this.displayId, delta); |
| 147 } | 142 } |
| 148 }); | 143 }); |
| OLD | NEW |