From b73bf700ec4804a40bf932264baa88ef8df8b448 Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Tue, 26 Jul 2005 11:31:59 +0000 Subject: [PATCH] Bug 263146 (use the Cmd key instead of the Ctrl key on Mac) - tree-widget fixes. r+a=mconnor git-svn-id: svn://10.0.0.236/trunk@176606 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/widgets/tree.xml | 54 ++++++++++++++++-------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/mozilla/toolkit/content/widgets/tree.xml b/mozilla/toolkit/content/widgets/tree.xml index 4f2ac2ba4b3..f632450defb 100644 --- a/mozilla/toolkit/content/widgets/tree.xml +++ b/mozilla/toolkit/content/widgets/tree.xml @@ -11,6 +11,19 @@ + + + + + + @@ -290,7 +303,7 @@ @@ -345,13 +359,14 @@ return; } catch (e) {} // Extend the selection from the existing pivot, if any - this.view.selection.rangedSelect(-1, c + 1, event.ctrlKey); + this.view.selection.rangedSelect(-1, c + 1, + this._isAccelPressed(event)); this.treeBoxObject.ensureRowIsVisible(c + 1); ]]> @@ -436,7 +451,7 @@ this.treeBoxObject.scrollByPages(1); } // Extend the selection from the existing pivot, if any - this.view.selection.rangedSelect(-1, i, event.ctrlKey); + this.view.selection.rangedSelect(-1, i, this._isAccelPressed(event)); ]]> @@ -444,7 +459,7 @@ if (this.view.rowCount == 0) return; // Normal behaviour is to select the first row - if (!event.ctrlKey) + if (!this._isAccelPressed(event)) this.view.selection.timedSelect(0, this._selectDelay); // In a multiselect tree Ctrl+Home moves the anchor else if (!this.view.selection.single) @@ -458,7 +473,7 @@ if (l < 0) return; // Normal behaviour is to select the last row - if (!event.ctrlKey) + if (!this._isAccelPressed(event)) this.view.selection.timedSelect(l, this._selectDelay); // In a multiselect tree Ctrl+End moves the anchor else if (!this.view.selection.single) @@ -471,7 +486,7 @@ if (this.view.selection.single) return; // Extend the selection from the existing pivot, if any - this.view.selection.rangedSelect(-1, 0, event.ctrlKey); + this.view.selection.rangedSelect(-1, 0, this._isAccelPressed(event)); this.treeBoxObject.ensureRowIsVisible(0); ]]> @@ -481,7 +496,7 @@ return; var l = this.view.rowCount - 1; // Extend the selection from the existing pivot, if any - this.view.selection.rangedSelect(-1, l, event.ctrlKey); + this.view.selection.rangedSelect(-1, l, this._isAccelPressed(event)); this.treeBoxObject.ensureRowIsVisible(l); ]]> @@ -489,12 +504,14 @@ 0 && - !event.altKey && !event.ctrlKey && !event.shiftKey && !event.metaKey) { + !event.altKey && !this._isAccelPressed(event) && + !event.shiftKey && !event.metaKey) { var key = String.fromCharCode(event.charCode); key = key.toLowerCase(); if (event.timeStamp - this._lastKeyTime > 1000) @@ -596,7 +613,8 @@ click, so that drags work correctly. -->