diff options
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/ChangeLog | 7 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog index fc6f9f27f8..7b6dffc427 100644 --- a/main/src/core/MonoDevelop.Ide/ChangeLog +++ b/main/src/core/MonoDevelop.Ide/ChangeLog @@ -1,3 +1,10 @@ +2010-06-28 Lluis Sanchez Gual <lluis@novell.com> + + * MonoDevelop.Components.Docking/DockBarItem.cs: Don't hide + the item if the mouse pointer is inside the window. Fixes + bug #565714 - Autohidden pads hide when viewing treeview + tooltips. + 2010-06-28 Mike Krüger <mkrueger@novell.com> * MonoDevelop.Ide.Gui.Content/CompletionTextEditorExtension.cs: diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs index 51e17512f8..fb1519b9b7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs @@ -286,7 +286,12 @@ namespace MonoDevelop.Components.Docking if (autoHideTimeout == uint.MaxValue) { autoHideTimeout = GLib.Timeout.Add (force ? 0 : bar.Frame.AutoHideDelay, delegate { // Don't hide the item if it has the focus. Try again later. - if (it.Widget.FocusChild != null) + if (it.Widget.FocusChild != null && !force) + return true; + // Don't hide the item if the mouse pointer is still inside the window. Try again later. + int px, py; + it.Widget.GetPointer (out px, out py); + if (it.Widget.Visible && it.Widget.IsRealized && it.Widget.Allocation.Contains (px, py) && !force) return true; autoHideTimeout = uint.MaxValue; AutoHide (true); |