[SourceEditor] Added another work around for the cut&paste issue.monodevelop-4.0.2.19monodevelop-4.0.2

1 files changed, 23 insertions, 3 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
index fa348769d3..b23a89599a 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
@@ -159,13 +159,33 @@ namespace MonoDevelop.SourceEditor
 
 		public bool SearchWidgetHasFocus {
 			get {
-				if (searchAndReplaceWidget != null && searchAndReplaceWidget.FocusChild != null && searchAndReplaceWidget.FocusChild.HasFocus)
-					return true;
-				if (gotoLineNumberWidget != null && gotoLineNumberWidget.FocusChild != null && gotoLineNumberWidget.FocusChild.HasFocus)
+				if (HasAnyFocusedChild (searchAndReplaceWidget) || HasAnyFocusedChild (gotoLineNumberWidget))
 					return true;
 				return false;
 			}
 		}
+
+		static bool HasAnyFocusedChild (Widget widget)
+		{
+			// Seems that this is the only reliable way doing it on os x and linux :/
+			if (widget == null)
+				return false;
+			var stack = new Stack<Widget> ();
+			stack.Push (widget);
+			while (stack.Count > 0) {
+				var cur = stack.Pop ();
+				if (cur.HasFocus) {
+					return true;
+				}
+				var c = cur as Gtk.Container;
+				if (c!= null) {
+					foreach (var child in c.Children) {
+						stack.Push (child);
+					}
+				}
+			}
+			return false;
+		}
 		
 		public class Border : Gtk.DrawingArea
 		{