diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2017-03-27 19:40:09 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@microsoft.com> | 2017-03-27 19:40:09 +0300 |
commit | bcf0f49ff6994d1dc2d06d53a7518ae1ed35c571 (patch) | |
tree | 160c92b456601f6a46d3660eb2bdbb2c4290f93c /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components | |
parent | 0be22f7c0a199f9ffb185386eb85b620d0f37f58 (diff) | |
parent | 252dc8bac40ca46bf020351e331aa477763a020d (diff) |
Merge remote-tracking branch 'origin/master' into native-popups
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 | 16 |
1 files changed, 16 insertions, 0 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 b32b72be55..f4910c6724 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 @@ -37,6 +37,7 @@ using System.Text; using Mono.Addins; using MonoDevelop.Core; using MonoDevelop.Components; +using MonoDevelop.Components.AtkCocoaHelper; using MonoDevelop.Ide.Commands; using MonoDevelop.Components.Commands; using MonoDevelop.Ide.Gui.Pads; @@ -44,6 +45,7 @@ using MonoDevelop.Projects.Extensions; using System.Linq; using MonoDevelop.Ide.Tasks; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace MonoDevelop.Ide.Gui.Components { @@ -239,6 +241,11 @@ namespace MonoDevelop.Ide.Gui.Components tree.TestExpandRow += OnTestExpandRow; tree.RowActivated += OnNodeActivated; tree.DoPopupMenu += ShowPopup; + + // Add an extra action handler to the tree to handle Press actions + var actionHandler = tree.ActionHandler; + actionHandler.PerformPress += OnPerformPress; + workNode = new TreeNodeNavigator (this); compareNode1 = new TreeNodeNavigator (this); compareNode2 = new TreeNodeNavigator (this); @@ -2104,6 +2111,11 @@ namespace MonoDevelop.Ide.Gui.Components ActivateCurrentItem (); } + void OnPerformPress (object sender, EventArgs args) + { + ActivateCurrentItem (); + } + void OnSelectionChanged (object sender, EventArgs args) { TreeNodeNavigator node = (TreeNodeNavigator) GetSelectedNode (); @@ -2667,6 +2679,10 @@ namespace MonoDevelop.Ide.Gui.Components Xwt.Drawing.Image overlayTopLeft; Xwt.Drawing.Image overlayTopRight; + public ZoomableCellRendererPixbuf () : base () + { + } + public double Zoom { get { return zoom; } set { |