diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-05-06 09:14:28 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-05-06 09:14:28 +0400 |
| commit | b81093c782350770cc0c8293692b9e9138fe3f8c (patch) | |
| tree | 9f72c867e225158f00a1572b918ed297c72b3172 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components | |
| parent | 3b00c320f4d0efe935ff1d3218e5d69a5806f415 (diff) | |
* Mono.Texteditor/Mono.TextEditor/TextEditor.cs:
* MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs:
Fix cmd-scroll zoom on Mac. Use more conventional direction for
zooming.
svn path=/trunk/monodevelop/; revision=156771
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs index 78982ea49c..fa0d892002 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs @@ -1842,12 +1842,17 @@ namespace MonoDevelop.Ide.Gui.Components protected override bool OnScrollEvent (Gdk.EventScroll evnt) { - var modifier = PropertyService.IsMac? Gdk.ModifierType.MetaMask : Gdk.ModifierType.ControlMask; - if ((evnt.State & modifier) != 0) { - if (evnt.Direction == Gdk.ScrollDirection.Down) + var modifier = !PropertyService.IsMac? Gdk.ModifierType.ControlMask + //Mac window manager already uses control-scroll, so use command + //Command might be either meta or mod1, depending on GTK version + : (Gdk.ModifierType.MetaMask | Gdk.ModifierType.Mod1Mask); + + if ((evnt.State & modifier) !=0) { + if (evnt.Direction == Gdk.ScrollDirection.Up) ZoomIn (); - else + else if (evnt.Direction == Gdk.ScrollDirection.Down) ZoomOut (); + return true; } return base.OnScrollEvent (evnt); |