Attachment 277474 Details for Bug 479142

[patch] Proposed patch.

bridge.patch (text/plain), 6.38 KB, created by Mario Carrion on 2009-03-05 20:33:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mario Carrion

Created: 2009-03-05 20:33:03 UTC

Size: 6.38 KB

patch

obsolete

>Index: Test/AtkTest/AtkTests.cs
>===================================================================
>--- Test/AtkTest/AtkTests.cs	(revision 128719)
>+++ Test/AtkTest/AtkTests.cs	(working copy)
>@@ -953,7 +953,7 @@
> 			InterfaceImage (type, atkWithImage, atkComponent, atkWithoutImage);
> 		}
> 
>-		//[Test]
>+		[Test]
> 		public void ListView ()
> 		{
> 			BasicWidgetType type = BasicWidgetType.ListView;
>@@ -984,7 +984,6 @@
> 			States (accessible,
> 			  Atk.StateType.Enabled,
> 			  Atk.StateType.Focusable,
>-			  Atk.StateType.Focused, // from InterfaceSelection
> 			  Atk.StateType.ManagesDescendants,
> 			  Atk.StateType.Sensitive,
> 			  Atk.StateType.Showing,
>@@ -997,10 +996,13 @@
> 			Atk.Object header = FindObjectByRole (accessible, Atk.Role.TableColumnHeader);
> 			Assert.IsNotNull (header, "Header not null");
> 			States (header,
>+			    Atk.StateType.Selectable,
> 				Atk.StateType.Enabled,
> 				Atk.StateType.Sensitive,
> 				Atk.StateType.Showing,
> 				Atk.StateType.Visible);
>+			Atk.Action action = CastToAtkInterface<Atk.Action> (header);
>+			InterfaceAction (BasicWidgetType.HeaderItem, action, header);
> 
> 			Atk.Object child1 = FindObjectByName (accessible, "Programming Windows with C#");
> 			int child1Index = child1.IndexInParent;
>@@ -1015,14 +1017,9 @@
> 
> 			InterfaceText (group, "C#");
> 
>-			// For some reason, the next line would cause crashes
>-			// in later tests.
>-			//Relation (Atk.RelationType.NodeChildOf, child1, group);
>+			Relation (Atk.RelationType.NodeChildOf, child1, group);
> 
> 			Assert.AreEqual (3, atkTable.NColumns, "Table NumColumns");
>-			Assert.AreEqual (1, atkTable.GetRowAtIndex (groupIndex), "GetRowAtIndex");
>-			Assert.AreEqual (0, atkTable.GetColumnAtIndex (groupIndex), "GetColumnAtIndex");
>-			Assert.AreEqual (group, atkTable.RefAt (1, 0), "ListView RefAt");
> 		}
> 
> 		protected string simpleTable = "<table>"+
>Index: Test/AtkTest/AtkTester.cs
>===================================================================
>--- Test/AtkTest/AtkTester.cs	(revision 128719)
>+++ Test/AtkTest/AtkTester.cs	(working copy)
>@@ -249,6 +249,7 @@
> 			    type == BasicWidgetType.ListItem || 
> 			    type == BasicWidgetType.ParentMenu ||
> 			    type == BasicWidgetType.ChildMenu ||
>+			    type == BasicWidgetType.HeaderItem ||
> 			    type == BasicWidgetType.Spinner)
> 				validNumberOfActions = 1;
> 			else if (type == BasicWidgetType.CheckedListItem)
>@@ -419,6 +420,7 @@
> 
> 			//sub-items cannot be disabled, mainly because they are not widgets
> 			if ((type != BasicWidgetType.ListItem) &&
>+			    (type != BasicWidgetType.HeaderItem) &&
> 			    (type != BasicWidgetType.CheckedListItem) &&
> 			    (type != BasicWidgetType.ComboBoxItem)) { //disable a combobox item? let's not try weird things
> 				DisableWidget (accessible);
>Index: Test/AtkTest/BasicWidgetType.cs
>===================================================================
>--- Test/AtkTest/BasicWidgetType.cs	(revision 128719)
>+++ Test/AtkTest/BasicWidgetType.cs	(working copy)
>@@ -49,6 +49,7 @@
> 		TextBoxView,        // textbox multi-line (gtk: textview)
> 		PasswordCharTextBoxEntry, // textbox with PasswordChar set (gtk: entry with visibility:false)
> 		RichTextBox, // RichTextBox (gtk: textview)
>+		HeaderItem, // part of widget: GTK: treeview, and MWF: listview.details, datagrid and datagridview
> 		
> 		MainMenuBar,
> 		ParentMenu,
>Index: Test/UiaAtkBridgeTest/bridgetest.sh.in
>===================================================================
>--- Test/UiaAtkBridgeTest/bridgetest.sh.in	(revision 128719)
>+++ Test/UiaAtkBridgeTest/bridgetest.sh.in	(working copy)
>@@ -3,7 +3,7 @@
> DLL=UiaAtkBridgeTest.dll
> 
> TEST_DISPLAY=:1
>-NUNIT_FLAGS=-nothread
>+NUNIT_FLAGS=-nothread -noshadow
> 
> while getopts c:x o
> do case "$o" in
>Index: UiaAtkBridge/TreeItem.cs
>===================================================================
>--- UiaAtkBridge/TreeItem.cs	(revision 128719)
>+++ UiaAtkBridge/TreeItem.cs	(working copy)
>@@ -108,19 +108,6 @@
> 			return states;
> 		}
> 
>-		protected override Atk.RelationSet OnRefRelationSet ()
>-		{
>-			Atk.RelationSet relSet = base.OnRefRelationSet ();
>-			IRawElementProviderFragment fragment = Provider as IRawElementProviderFragment;
>-			IRawElementProviderFragment parentProvider = fragment.Navigate (NavigateDirection.Parent);
>-			if (parentProvider != null) {
>-				Atk.Object parent = AutomationBridge.GetAdapterForProviderLazy (parentProvider);
>-				if (parent != null)
>-					relSet.AddRelationByType (Atk.RelationType.NodeChildOf, parent);
>-			}
>-			return relSet;
>-		}
>-
> 		public string GetText (int startOffset, int endOffset)
> 		{
> 			return textExpert.GetText (startOffset, endOffset);
>Index: UiaAtkBridge/Adapter.cs
>===================================================================
>--- UiaAtkBridge/Adapter.cs	(revision 128719)
>+++ UiaAtkBridge/Adapter.cs	(working copy)
>@@ -212,6 +212,45 @@
> 			return states;
> 		}
> 
>+		protected override Atk.RelationSet OnRefRelationSet ()
>+		{
>+			Atk.RelationSet relationSet = base.OnRefRelationSet ();
>+
>+			if (Role == Atk.Role.ScrollBar
>+			    || Role == Atk.Role.RadioButton)
>+				return relationSet;
>+			
>+			IRawElementProviderFragment fragment = Provider as IRawElementProviderFragment;
>+			IRawElementProviderFragment parentProvider = fragment.Navigate (NavigateDirection.Parent);
>+			
>+			if (parentProvider != null) {
>+				// To support NodeChildOf parent must be either
>+				// - DataGrid, Table or Group, or
>+				// - ListItem or DataItem, in this case the parent of parent is used,
>+				//   because we are ignoring this parent (either ListItem or DataItem).
>+				int controlType 
>+					= (int) parentProvider.GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id);
>+				Atk.Object parentAdapter = null;
>+
>+				if (controlType == ControlType.DataGrid.Id
>+				    || controlType == ControlType.Table.Id
>+				    || controlType == ControlType.Group.Id)
>+					parentAdapter = AutomationBridge.GetAdapterForProviderLazy (parentProvider);
>+				else if (controlType == ControlType.ListItem.Id
>+				         || controlType == ControlType.DataItem.Id) {
>+					parentProvider = parentProvider.Navigate (NavigateDirection.Parent);
>+					parentAdapter = AutomationBridge.GetAdapterForProviderLazy (parentProvider);					
>+				} else
>+					return relationSet;
>+				
>+				if (parentAdapter != null)
>+					relationSet.AddRelationByType (Atk.RelationType.NodeChildOf, 
>+					                               parentAdapter);
>+			}
>+
>+			return relationSet;
>+		}		
>+
> 		protected override int OnGetIndexInParent()
> 		{
> 			if (Parent == null)

Actions: View | Diff

Attachments on bug 479142: 277474 | 277481