View | Details | Raw Unified | Return to bug 489941
Collapse All | Expand All

(-)UiaAtkBridge/UiaAtkBridge/TreeItem.cs (-2 / +11 lines)
Lines 32-38 Link Here
32
namespace UiaAtkBridge
32
namespace UiaAtkBridge
33
{
33
{
34
34
35
	public class TreeItem : ComponentAdapter, Atk.TextImplementor, Atk.ActionImplementor,
35
	public class TreeItem : ComponentParentAdapter, Atk.TextImplementor, Atk.ActionImplementor,
36
		Atk.ImageImplementor, Atk.EditableTextImplementor
36
		Atk.ImageImplementor, Atk.EditableTextImplementor
37
	{
37
	{
38
		protected const string EXPAND_OR_CONTRACT_ACTION_NAME = "expand or contract";
38
		protected const string EXPAND_OR_CONTRACT_ACTION_NAME = "expand or contract";
Lines 76-81 Link Here
76
			editableTextExpert = new EditableTextImplementorHelper (this, this);
76
			editableTextExpert = new EditableTextImplementorHelper (this, this);
77
		}
77
		}
78
		
78
		
79
		public override void RaiseStructureChangedEvent (object provider, StructureChangedEventArgs e)
80
		{
81
			//TODO
82
			return;
83
		}
84
		
79
		protected IToggleProvider ToggleProvider {
85
		protected IToggleProvider ToggleProvider {
80
			get {
86
			get {
81
				return (IToggleProvider) Provider.GetPatternProvider (TogglePatternIdentifiers.Pattern.Id);
87
				return (IToggleProvider) Provider.GetPatternProvider (TogglePatternIdentifiers.Pattern.Id);
Lines 412-418 Link Here
412
				if (oldValue == ExpandCollapseState.Expanded || newValue == ExpandCollapseState.Expanded) {
418
				if (oldValue == ExpandCollapseState.Expanded || newValue == ExpandCollapseState.Expanded) {
413
					bool expanded = (newValue == ExpandCollapseState.Expanded);
419
					bool expanded = (newValue == ExpandCollapseState.Expanded);
414
					NotifyStateChange (Atk.StateType.Expanded, expanded);
420
					NotifyStateChange (Atk.StateType.Expanded, expanded);
415
					((Tree)Parent).NotifyRowAdjusted (this, expanded);
421
					var parent = Parent;
422
					while (!(parent is Tree))
423
						parent = parent.Parent;
424
					((Tree)parent).NotifyRowAdjusted (this, expanded);
416
				}
425
				}
417
			} else
426
			} else
418
				base.RaiseAutomationPropertyChangedEvent (e);
427
				base.RaiseAutomationPropertyChangedEvent (e);
(-)UiaAtkBridge/UiaAtkBridge/AutomationBridge.cs (-2 / +2 lines)
Lines 510-519 Link Here
510
			int parentControlTypeId = (int)
513
			int parentControlTypeId = (int)
511
				parentProvider.GetPropertyValue (AEIds.ControlTypeProperty.Id);
514
				parentProvider.GetPropertyValue (AEIds.ControlTypeProperty.Id);
512
			if (parentControlTypeId == ControlType.Header.Id ||
515
			if (parentControlTypeId == ControlType.Header.Id ||
513
			    parentControlTypeId == ControlType.DataItem.Id ||
516
			    parentControlTypeId == ControlType.DataItem.Id)// ||
514
			    parentControlTypeId == ControlType.TreeItem.Id)
517
			    //parentControlTypeId == ControlType.TreeItem.Id)
515
				return GetParentAdapter (parentProvider);
518
				return GetParentAdapter (parentProvider);
516
519
517
			// For a MenuItem provider, a Menu parent could indicate
520
			// For a MenuItem provider, a Menu parent could indicate
518
			// the hidden menu generated when a parent MenuItem is
521
			// the hidden menu generated when a parent MenuItem is
519
			// expanded. So if grandparent is MenuItem, treat its
522
			// expanded. So if grandparent is MenuItem, treat its

Return to bug 489941