Attachment 272072 Details for Bug 474634

[patch] Proposed patch.

invisible.patch (text/plain), 13.45 KB, created by Mario Carrion on 2009-02-11 21:35:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Carrion

Created: 2009-02-11 21:35:08 UTC

Size: 13.45 KB

patch

obsolete

>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms/FragmentControlProvider.cs
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms/FragmentControlProvider.cs	(revision 126639)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms/FragmentControlProvider.cs	(working copy)
>@@ -43,6 +43,7 @@
> 		#region Private Fields
> 		
> 		private List<FragmentControlProvider> children;
>+		private List<Component> componentChildren;
> 		private INavigation navigation;
> 		private SWF.ContextMenu contextMenu;
> 		private SWF.ContextMenuStrip contextMenuStrip;
>@@ -63,6 +64,7 @@
> 			componentProviders =
> 				new Dictionary<Component, FragmentControlProvider> ();
> 			children = new List<FragmentControlProvider> ();
>+			componentChildren = new List<Component> ();
> 
> 			if (Control != null) {
> 				Control.ContextMenuChanged += HandleContextMenuChanged;
>@@ -223,30 +225,19 @@
> 			//       aren't sent to bridge until the parent's already
> 			//       there.  There are about 100 ways to do this
> 			//       better.
>-			if (Control != null) {
>+			if (Control != null) {				
> 				Control.ControlAdded += OnControlAdded;
> 				Control.ControlRemoved += OnControlRemoved;
> 				
>-				foreach (SWF.Control childControl in Control.Controls) {
>-					FragmentControlProvider childProvider =
>-						CreateProvider (childControl);
>-					
>-					if (childProvider == null)
>-						continue;
>-					// TODO: Null check, compound, etc?
>-
>-					componentProviders [childControl] = childProvider;
>-					OnNavigationChildAdded (false,
>-					                        (FragmentControlProvider) childProvider);
>-				}
>+				foreach (SWF.Control childControl in Control.Controls)
>+					HandleComponentAdded (childControl, false);
> 			}
> 		}
> 		
> 		public virtual void FinalizeChildControlStructure ()
> 		{
>-			for (; children.Count > 0; )
>-				OnNavigationChildRemoved (false, 
>-				                          (FragmentControlProvider) children [0]);
>+			for (; componentChildren.Count > 0; )
>+				HandleComponentRemoved (componentChildren [0], false);
> 
> 			children.Clear ();
> 			componentProviders.Clear ();
>@@ -320,37 +311,24 @@
> 	
> 		private void OnControlAdded (object sender, SWF.ControlEventArgs args)
> 		{
>-			SWF.Control childControl = args.Control;
>-			FragmentControlProvider childProvider = CreateProvider (childControl);
>-			if (childProvider == null)
>-				return;
>-
>-			componentProviders [childControl] = childProvider;	
>-			OnNavigationChildAdded (true, 
>-			                        (FragmentControlProvider) childProvider);
>+			HandleComponentAdded (args.Control, true);
> 		}
> 	
> 		private void OnControlRemoved (object sender, SWF.ControlEventArgs args)
> 		{
>-			FragmentControlProvider removedProvider;
>-			
>-			if (componentProviders.TryGetValue (args.Control, out removedProvider) == true) {
>-				
>-				// TODO: Some sort of disposal
>-				
>-				componentProviders.Remove (args.Control);
>-				// StructureChangedEvent
>-				// TODO: Use correct arguments, and fix bridge
>-				//       to handle them!!!
>-				//       Event source: Parent of removed child
>-				//       runtimeId: The child that was removed.
>-				//       (pg 6 of fxref_uiautomationtypes_p2.pdf)
>-				OnNavigationChildRemoved (true, 
>-				                          (FragmentControlProvider) removedProvider);
>-				ProviderFactory.ReleaseProvider (args.Control);
>-			}
>+			HandleComponentRemoved (args.Control, true);
> 		}
> 
>+		private void OnNotVisibleControlVisibleChanged (object sender, EventArgs args)
>+		{
>+			SWF.Control control = (SWF.Control) sender;
>+
>+			if (control.Visible)
>+				InitializeComponentProvider (control, true);
>+			else
>+				TerminateComponentProvider (control, true);
>+		}
>+
> 		#endregion
> 
> 		#region Protected Methods
>@@ -362,6 +340,16 @@
> 
> 			return (FragmentControlProvider) ProviderFactory.GetProvider (control);
> 		}
>+
>+		protected virtual FragmentControlProvider CreateProvider (Component component)
>+		{
>+			return (FragmentControlProvider) ProviderFactory.GetProvider (component);
>+		}
>+
>+		protected virtual void DestroyProvider (Component component)
>+		{
>+			ProviderFactory.ReleaseProvider (component);
>+		}
> 		
> 		protected FragmentControlProvider GetProvider (SWF.Control control)
> 		{
>@@ -371,7 +359,110 @@
> 				return null;
> 		}
> 
>+		protected void InitializeComponentProvider (Component childComponent,
>+		                                            bool raiseEvent)
>+		{
>+			SWF.Control control = null;
>+			FragmentControlProvider childProvider = null;
>+			
>+			if ((control = childComponent as SWF.Control) != null)
>+				childProvider = CreateProvider (control);
>+			else
>+				childProvider = CreateProvider (childComponent);
>+			
>+			if (childProvider == null)
>+				return;
>+			// TODO: Null check, compound, etc?
>+
>+			componentProviders [childComponent] = childProvider;
>+			OnNavigationChildAdded (raiseEvent, childProvider);
>+		}
>+
>+		protected void TerminateComponentProvider (Component childComponent,
>+		                                           bool raiseEvent)
>+		{			
>+			FragmentControlProvider removedProvider;
>+			
>+			if (componentProviders.TryGetValue (childComponent, 
>+			                                    out removedProvider)) {
>+				componentProviders.Remove (childComponent);
>+				// Event source:
>+				//       Parent of removed child runtimeId: The child that was
>+				//       removed. (pg 6 of fxref_uiautomationtypes_p2.pdf)
>+				OnNavigationChildRemoved (raiseEvent, removedProvider);
>+				DestroyProvider (childComponent);
>+			}
>+		}
>+
>+		protected void AddChildComponent (Component childComponent)
>+		{
>+			if (componentChildren.Contains (childComponent))
>+				return;
>+
>+			componentChildren.Add (childComponent);
>+			AddVisibleEvent (childComponent);
>+		}
>+
>+		protected void RemoveChildComponent (Component childComponent)
>+		{
>+			if (!componentChildren.Contains (childComponent))
>+				return;
>+			
>+			componentChildren.Remove (childComponent);
>+			RemoveVisibleEvent (childComponent);
>+		}
>+
>+		protected virtual void AddVisibleEvent (Component component)
>+		{
>+			SWF.Control control = null;
>+
>+			if ((control = component as SWF.Control) != null)
>+				control.VisibleChanged += OnNotVisibleControlVisibleChanged;
>+		}		
>+
>+		protected virtual void RemoveVisibleEvent (Component component)
>+		{
>+			SWF.Control control = null;
>+
>+			if ((control = component as SWF.Control) != null)
>+				control.VisibleChanged -= OnNotVisibleControlVisibleChanged;			
>+		}
>+
>+		protected virtual bool IsComponentVisible (Component component)
>+		{
>+			SWF.Control control = null;
>+			if ((control = component as SWF.Control) != null)
>+				return control.Visible;
>+			else // Component based providers will need to override this method
>+				return false;
>+		}
>+
> 		#endregion
>+
>+		#region Private Methods
>+
>+		private void HandleComponentAdded (Component component, bool raiseEvent)
>+		{
>+			AddChildComponent (component);
>+
>+			// We don't add an invisible component but we keep track of its 
>+			// Visible event to add it when Visible changes
>+			if (!IsComponentVisible (component))
>+				return;
>+
>+			InitializeComponentProvider (component, raiseEvent);
>+		}
>+
>+		private void HandleComponentRemoved (Component component, bool raiseEvent)
>+		{
>+			// We will only need to Terminate when is visible.
>+			if (IsComponentVisible (component))
>+				TerminateComponentProvider (component, raiseEvent);
>+
>+			RemoveChildComponent (component);
>+		}
>+
>+		#endregion
> 		
> 		#region IRawElementProviderFragment Interface 
> 
>Index: UIAutomationWinformsTests/FormProviderTest.cs
>===================================================================
>--- UIAutomationWinformsTests/FormProviderTest.cs	(revision 126639)
>+++ UIAutomationWinformsTests/FormProviderTest.cs	(working copy)
>@@ -825,6 +825,172 @@
> 		}
> 
> #endregion
>+
>+		#region Invisible/Visible Tests
>+
>+		[Test]
>+		public void InvisibleVisibleTest ()
>+		{
>+			IRawElementProviderFragmentRoot rootProvider = null;
>+			IRawElementProviderFragment buttonProvider = null;
>+			Button button = null;
>+			Form f = null;
>+			
>+			// Exposes 474634 and 464356
>+			using (f = new Form ()) {
>+				f.Size = new System.Drawing.Size (400, 400);
>+				f.Show ();
>+
>+				// Empty form NO CHILDREN
>+				rootProvider 
>+					= (IRawElementProviderFragmentRoot) ProviderFactory.GetProvider (f);
>+
>+				Assert.AreEqual (0, 
>+				                 ChildrenCount (rootProvider),
>+				                 "No children");
>+
>+				// Adding invisible button
>+				button = new Button ();
>+				button.Text = "button";
>+				button.Visible = false;
>+				f.Controls.Add (button);
>+
>+				Assert.AreEqual (0, 
>+				                 ChildrenCount (rootProvider),
>+				                 "No children");
>+
>+				// Changing visibility
>+				bridge.ResetEventLists ();
>+				button.Visible = true;
>+				Assert.AreEqual (1, 
>+				                 ChildrenCount (rootProvider),
>+				                 "1 child");
>+				buttonProvider
>+					= (IRawElementProviderFragment) ProviderFactory.FindProvider (button);
>+				Assert.IsNotNull (buttonProvider, "ButtonProvider missing");
>+				Assert.IsNotNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+				                                                       StructureChangeType.ChildAdded),
>+				                  "Button. StructureChangeType.ChildAdded event missing");
>+				Assert.AreEqual (rootProvider,
>+				                 buttonProvider.Navigate (NavigateDirection.Parent),
>+				                 "FormProvider != button.Parent");
>+				buttonProvider = null;
>+				
>+				bridge.ResetEventLists ();
>+				button.Visible = false;
>+				Assert.AreEqual (0, 
>+				                 ChildrenCount (rootProvider),
>+				                 "1 child");
>+				buttonProvider
>+					= (IRawElementProviderFragment) ProviderFactory.FindProvider (button);
>+				Assert.IsNull (buttonProvider, "ButtonProvider missing");
>+				Assert.IsNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+				                                                    StructureChangeType.ChildAdded),
>+				               "Button. StructureChangeType.ChildAdded event missing");
>+				buttonProvider = null;
>+
>+				// We are already invisible, we don't need to raise any event
>+				bridge.ResetEventLists ();
>+				f.Controls.Remove (button);
>+				Assert.AreEqual (0,
>+				                 ChildrenCount (rootProvider),
>+				                 "No children");
>+				buttonProvider
>+					= (IRawElementProviderFragment) ProviderFactory.FindProvider (button);
>+				Assert.IsNull (buttonProvider, "ButtonProvider missing");
>+				Assert.IsNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+				                                                    StructureChangeType.ChildAdded),
>+				               "Button. StructureChangeType.ChildAdded event missing");
>+			}
>+		}
>+
>+		[Test]
>+		public void InvisibleVisibleTest1 ()
>+		{
>+			// Similar to InvisibleVisibleTest but with invisible items
>+			// before calling Show and getting the provider.
>+			IRawElementProviderFragmentRoot rootProvider = null;
>+			IRawElementProviderSimple buttonProvider = null;
>+			Button button = null;
>+			
>+			Form f = new Form ();
>+			f.Size = new System.Drawing.Size (400, 400);
>+			f.Show ();
>+
>+			// Adding invisible button
>+			button = new Button ();
>+			button.Text = "button";
>+			button.Visible = false;
>+			f.Controls.Add (button);
>+
>+			f.Show ();
>+
>+			// Empty form NO CHILDREN
>+			rootProvider 
>+				= (IRawElementProviderFragmentRoot) ProviderFactory.GetProvider (f);
>+
>+			Assert.AreEqual (0, 
>+			                 ChildrenCount (rootProvider),
>+			                 "No children");
>+
>+			// Changing visibility
>+			bridge.ResetEventLists ();
>+			button.Visible = true;
>+			Assert.AreEqual (1, 
>+			                 ChildrenCount (rootProvider),
>+			                 "1 child");
>+			buttonProvider
>+				= ProviderFactory.FindProvider (button);
>+			Assert.IsNotNull (buttonProvider, "ButtonProvider missing");
>+			Assert.IsNotNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+			                                                       StructureChangeType.ChildAdded),
>+			                  "Button. StructureChangeType.ChildAdded event missing");
>+			buttonProvider = null;
>+			
>+			bridge.ResetEventLists ();
>+			button.Visible = false;
>+			Assert.AreEqual (0, 
>+			                 ChildrenCount (rootProvider),
>+			                 "1 child");
>+			buttonProvider
>+				= ProviderFactory.FindProvider (button);
>+			Assert.IsNull (buttonProvider, "ButtonProvider missing");
>+			Assert.IsNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+			                                                    StructureChangeType.ChildAdded),
>+			               "Button. StructureChangeType.ChildAdded event missing");
>+			buttonProvider = null;
>+
>+			// We are already invisible, we don't need to raise any event
>+			bridge.ResetEventLists ();
>+			f.Controls.Remove (button);
>+			Assert.AreEqual (0,
>+			                 ChildrenCount (rootProvider),
>+			                 "No children");
>+			buttonProvider
>+				= ProviderFactory.FindProvider (button);
>+			Assert.IsNull (buttonProvider, "ButtonProvider missing");
>+			Assert.IsNull (bridge.GetStructureChangedEventFrom (buttonProvider,
>+			                                                    StructureChangeType.ChildAdded),
>+			               "Button. StructureChangeType.ChildAdded event missing");
>+
>+			f.Dispose ();
>+		}
>+
>+		private int ChildrenCount (IRawElementProviderFragmentRoot rootProvider)
>+		{
>+			int children = 0;
>+			
>+			IRawElementProviderFragment child 
>+				= rootProvider.Navigate (NavigateDirection.FirstChild);
>+			while (child != null) {
>+				children++;
>+				child = child.Navigate (NavigateDirection.NextSibling);
>+			}
>+
>+			return children;
>+		}
>+
>+		#endregion
> 		
> #region BaseProviderTest Overrides
>

Actions: View | Diff

Attachments on bug 474634: 272072 | 296873