Attachment 272830 Details for Bug 468271

[patch] Provider patch

new.patch (text/plain), 13.41 KB, created by Mario Carrion on 2009-02-13 23:46:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Carrion

Created: 2009-02-13 23:46:23 UTC

Size: 13.41 KB

patch

obsolete

>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs	(revision 126894)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs	(working copy)
>@@ -1163,6 +1163,8 @@
> 				// Automation Events
> 				SetEvent (ProviderEventType.AutomationElementIsOffscreenProperty,
> 				          new ListItemEditAutomationIsOffscreenPropertyEvent (this));
>+				SetEvent (ProviderEventType.AutomationElementHasKeyboardFocusProperty,
>+				          new ListItemEditAutomationHasKeyboardFocusPropertyEvent (this));
> 			}
> 
> 			protected override object GetProviderPropertyValue (int propertyId)
>@@ -1175,10 +1177,13 @@
> 					IValueProvider valueProvider = (IValueProvider) GetBehavior (ValuePatternIdentifiers.Pattern);
> 					return valueProvider.Value;
> 				} else if (propertyId == AutomationElementIdentifiers.IsKeyboardFocusableProperty.Id)
>-					return false;
>-				else if (propertyId == AutomationElementIdentifiers.HasKeyboardFocusProperty.Id)
>-					return false;
>-				else if (propertyId == AutomationElementIdentifiers.IsEnabledProperty.Id)
>+					return IsFirstColumn || itemProvider.ListView.FullRowSelect;
>+				else if (propertyId == AutomationElementIdentifiers.HasKeyboardFocusProperty.Id) {
>+					if (IsFirstColumn)
>+						return itemProvider.GetPropertyValue (propertyId);
>+					else
>+						return false;
>+				} else if (propertyId == AutomationElementIdentifiers.IsEnabledProperty.Id)
> 					return true;
> 				else if (propertyId == AutomationElementIdentifiers.LabeledByProperty.Id)
> 					return null;
>@@ -1210,6 +1215,12 @@
> 					return base.GetProviderPropertyValue (propertyId);
> 			}
> 
>+			bool IsFirstColumn {
>+				get {
>+					return header.Index == 0;
>+					//return itemProvider.ListView.Columns.IndexOf (header) == 0;
>+				}
>+			}
> 			private ListViewListItemProvider itemProvider;
> 			private SWF.ColumnHeader header;
> 		} //ListViewListItemEditProvider
>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp	(revision 126894)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms.mdp	(working copy)
>@@ -1,4 +1,4 @@
>-<Project name="Mono.UIAutomation.Winforms" fileversion="2.0" language="C#" DefaultNamespace="Mono.UIAutomation.Winforms" UseParentDirectoryAsNamespace="True" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
>+<Project name="Mono.UIAutomation.Winforms" fileversion="2.0" language="C#" UseParentDirectoryAsNamespace="True" DefaultNamespace="Mono.UIAutomation.Winforms" clr-version="Net_2_0" targetFramework="3.5" ctype="DotNetProject">
>   <Configurations active="Debug">
>     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
>       <Output directory="bin/Debug" signAssembly="True" assemblyKeyFile="../mono-uia.snk" assembly="UIAutomationWinforms" />
>@@ -542,6 +542,7 @@
>     <File name="Mono.UIAutomation.Winforms.Events/PropertyGrid/SelectionPatternSelectionEvent.cs" subtype="Code" buildaction="Compile" />
>     <File name="Mono.UIAutomation.Winforms.Behaviors/ToolBar/ToolBarButtonToggleProviderBehavior.cs" subtype="Code" buildaction="Compile" />
>     <File name="Mono.UIAutomation.Winforms.Events/ToolBar/ToolBarButtonTogglePatternToggleStateEvent.cs" subtype="Code" buildaction="Compile" />
>+    <File name="Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationHasKeyboardFocusPropertyEvent.cs" subtype="Code" buildaction="Compile" />
>   </Contents>
>   <References>
>     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
>Index: UIAutomationWinforms/Makefile.am
>===================================================================
>--- UIAutomationWinforms/Makefile.am	(revision 126894)
>+++ UIAutomationWinforms/Makefile.am	(working copy)
>@@ -341,6 +341,7 @@
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemAutomationIsOffscreenPropertyEvent.cs \
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemCheckBoxAutomationIsOffscreenPropertyEvent.cs \
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemCheckBoxTogglePatternToggleStateEvent.cs \
>+	Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationHasKeyboardFocusPropertyEvent.cs \
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationIsOffscreenPropertyEvent.cs \
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemEditGridItemColumnEvent.cs \
> 	Mono.UIAutomation.Winforms.Events/ListView/ListItemEditGridItemRowEvent.cs \
>Index: UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationHasKeyboardFocusPropertyEvent.cs
>===================================================================
>--- UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationHasKeyboardFocusPropertyEvent.cs	(revision 0)
>+++ UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ListView/ListItemEditAutomationHasKeyboardFocusPropertyEvent.cs	(revision 0)
>@@ -0,0 +1,77 @@
>+// Permission is hereby granted, free of charge, to any person obtaining 
>+// a copy of this software and associated documentation files (the 
>+// "Software"), to deal in the Software without restriction, including 
>+// without limitation the rights to use, copy, modify, merge, publish, 
>+// distribute, sublicense, and/or sell copies of the Software, and to 
>+// permit persons to whom the Software is furnished to do so, subject to 
>+// the following conditions: 
>+//  
>+// The above copyright notice and this permission notice shall be 
>+// included in all copies or substantial portions of the Software. 
>+//  
>+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
>+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
>+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
>+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
>+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
>+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
>+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
>+// 
>+// Copyright (c) 2009 Novell, Inc. (http://www.novell.com) 
>+// 
>+// Authors: 
>+//	Mario Carrion <mcarrion@novell.com>
>+// 
>+
>+using System;
>+using System.ComponentModel;
>+using System.Windows.Automation;
>+using System.Windows.Automation.Provider;
>+using SWF = System.Windows.Forms;
>+using Mono.UIAutomation.Winforms.Events;
>+
>+namespace Mono.UIAutomation.Winforms.Events.ListView
>+{
>+
>+	internal class ListItemEditAutomationHasKeyboardFocusPropertyEvent
>+		: AutomationHasKeyboardFocusPropertyEvent
>+	{
>+		
>+		#region Constructors
>+
>+		public ListItemEditAutomationHasKeyboardFocusPropertyEvent (ListViewProvider.ListViewListItemEditProvider editProvider)
>+			: base (editProvider)
>+		{
>+			this.editProvider = editProvider;
>+		}
>+		
>+		#endregion
>+		
>+		#region IConnectable Overrides
>+	
>+		public override void Connect ()
>+		{
>+			editProvider.ItemProvider.ListView.UIAFocusedItemChanged 
>+				+= OnUIAFocusedItemChanged;
>+		}
>+
>+		public override void Disconnect ()
>+		{
>+			editProvider.ItemProvider.ListView.UIAFocusedItemChanged 
>+				-= OnUIAFocusedItemChanged;
>+		}
>+		
>+		#endregion
>+		
>+		#region Private Fields
>+		
>+		private void OnUIAFocusedItemChanged (object sender, EventArgs args)
>+		{
>+			RaiseAutomationPropertyChangedEvent ();
>+		}
>+
>+		private ListViewProvider.ListViewListItemEditProvider editProvider;
>+		
>+		#endregion
>+	}
>+}
>Index: UIAutomationWinformsTests/ListViewProviderTest.cs
>===================================================================
>--- UIAutomationWinformsTests/ListViewProviderTest.cs	(revision 126894)
>+++ UIAutomationWinformsTests/ListViewProviderTest.cs	(working copy)
>@@ -2285,6 +2285,159 @@
> 			}
> 		}
> 
>+		[Test]
>+		public void Bug468271Test ()
>+		{
>+			// NOTE: This test only exposes bug in Provider side.
>+			// ListView_details: "table cell" isn't accessible without "focused"
>+			ListView listview = new ListView ();
>+			listview.View = View.Details;
>+			listview.CheckBoxes = true;
>+			listview.GridLines = true;
>+			listview.Sorting = SortOrder.Ascending;
>+			listview.Dock = DockStyle.Top;
>+			listview.Width = 350;
>+			listview.Height = 260;
>+
>+			listview.Columns.Add ("Column1", 200, HorizontalAlignment.Left);
>+			listview.Columns.Add ("Column2", 200, HorizontalAlignment.Left);
>+			listview.Columns.Add ("Column3", 200, HorizontalAlignment.Left);
>+
>+			for (int index = 0; index < 3; index++) {
>+				ListViewItem item = new ListViewItem (string.Format ("Item:{0}", index));
>+				item.SubItems.Add (index.ToString ());
>+				item.SubItems.Add ((index+10).ToString ());
>+				listview.Items.Add (item);
>+			}
>+
>+			// We have the following table:
>+			// "Column1"         | "Column2" | "Column3"
>+			// ------------------|-----------|----------
>+			// checkbox, "Item0" | "0"       | "10"
>+			// checkbox, "Item1" | "1"       | "11"
>+			// checkbox, "Item2" | "2"       | "12"
>+
>+			// ListViewUIATree:
>+			// - Header
>+			//   - HeaderItem "Column1"
>+			//   - HeaderItem "Column2"
>+			//   - HeaderItem "Column3"
>+			// - DataItem "Item0"
>+			//   - CheckBox
>+			//   - "Item0"
>+			//   - "0"
>+			//   - "10"
>+			// - DataItem "Item1"
>+			//   - CheckBox
>+			//   - "Item1"
>+			//   - "1"
>+			//   - "11"
>+			// - DataItem "Item2"
>+			//   - CheckBox
>+			//   - "Item2"
>+			//   - "2"
>+			//   - "12"
>+			IRawElementProviderFragmentRoot root
>+				= (IRawElementProviderFragmentRoot) GetProviderFromControl (listview);
>+			Assert.IsNotNull (root, "Missing ListViewProvider");
>+			IRawElementProviderFragmentRoot []dataItems = new IRawElementProviderFragmentRoot [3];
>+			IRawElementProviderFragment child = root.Navigate (NavigateDirection.FirstChild);
>+			Assert.IsNotNull (child, "Missing child");
>+			
>+			int dataItem = 0;
>+			while (child != null) {				
>+				if ((int) child.GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id)
>+				    == ControlType.DataItem.Id) {
>+					dataItems [dataItem] = (IRawElementProviderFragmentRoot) child;
>+					dataItem++;
>+				}
>+				child = child.Navigate (NavigateDirection.NextSibling);
>+			}
>+			Assert.AreEqual (dataItems.Length, dataItem, "Count != DataItems");
>+
>+			// You *can* only focus 1 item, so, focusing a different item
>+			// will unfocus previous item and focus new item.
>+
>+			// listview.FullRowSelect = false: first subitem will is selected.
>+			bridge.ResetEventLists ();
>+			listview.Focus ();
>+			listview.Items [0].Focused = true;
>+			TestFocusInDataItemChildren (listview, 0, dataItems [0], true);
>+
>+			bridge.ResetEventLists ();
>+			listview.Items [1].Focused = true;
>+			TestFocusInDataItemChildren (listview, 1, dataItems [1], true);
>+			TestFocusInDataItemChildren (listview, 0, dataItems [0], false);
>+
>+			bridge.ResetEventLists ();
>+			listview.Items [2].Focused = true;
>+			TestFocusInDataItemChildren (listview, 2, dataItems [2], true);			
>+			TestFocusInDataItemChildren (listview, 1, dataItems [1], false);
>+		}
>+
>+		private int GetIndexFromName (ListViewItem item, string name)
>+		{
>+			int index = 0;
>+
>+			foreach (ListViewItem.ListViewSubItem subItem in item.SubItems) {
>+				if (subItem.Text == name)
>+					break;
>+				index++;
>+			}
>+
>+			return index;
>+		}
>+
>+		private void TestFocusInDataItemChildren (ListView listview, 
>+		                                          int index, 
>+		                                          IRawElementProviderFragmentRoot dataItemRoot,
>+		                                          bool focused)
>+		{
>+			AutomationPropertyChangedEventTuple tuple 
>+				= bridge.GetAutomationPropertyEventFrom (dataItemRoot, 
>+				                                         AutomationElementIdentifiers.HasKeyboardFocusProperty.Id);
>+			Assert.AreEqual (focused, 
>+			                 (bool) tuple.e.NewValue,
>+			                 "DataItem Focused value.");
>+
>+			IRawElementProviderFragment child = dataItemRoot.Navigate (NavigateDirection.FirstChild);
>+			Assert.IsNotNull (child, "Child should not be null");
>+			int subItem = 0;
>+			while (child != null) {
>+				bool hasfocus 
>+					= (bool) child.GetPropertyValue (AutomationElementIdentifiers.HasKeyboardFocusProperty.Id);
>+				if ((int) child.GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id)
>+				    == ControlType.Edit.Id) {
>+					string name
>+						= (string) child.GetPropertyValue (AutomationElementIdentifiers.NameProperty.Id);
>+					if (!focused)
>+						Assert.IsFalse (hasfocus,
>+						                string.Format ("{0}.{1} Name: '{0}'",
>+						                               index, subItem, name));
>+					else {
>+						if (listview.FullRowSelect
>+						    || GetIndexFromName (listview.Items [index], name) == 0)
>+							Assert.AreEqual (focused,
>+							                 hasfocus,
>+							                 string.Format ("{0}.{1} Name: '{0}'",
>+							                                index, subItem, name));
>+						else
>+							Assert.AreNotEqual (focused,
>+							                    hasfocus,
>+							                    string.Format ("{0}.{1} Name: '{0}'",
>+							                                   index, subItem, name));
>+					}
>+					subItem++;
>+				} else 
>+					// CheckBox only selected when is fullrow and is focused
>+					// is expected
>+					Assert.AreEqual (listview.FullRowSelect && focused, 
>+					                 hasfocus,
>+					                 string.Format ("{0}.CheckBox Focus should NOT be set", index));
>+				child = child.Navigate (NavigateDirection.NextSibling);
>+			}
>+		}
>+
> 		#region BaseProviderTest Overrides
> 
> 		protected override Control GetControlInstance ()

Actions: View | Diff

Attachments on bug 468271: 272830