Attachment 303386 Details for Bug 513057

[patch] bug fix patch

text_prop.patch (text/plain), 5.54 KB, created by Rui Guo on 2009-07-07 09:31:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rui Guo

Created: 2009-07-07 09:31:30 UTC

Size: 5.54 KB

patch

obsolete

>Index: UiaAtkBridge/TextImplementorFactory.cs
>===================================================================
>--- UiaAtkBridge/TextImplementorFactory.cs	(revision 137312)
>+++ UiaAtkBridge/TextImplementorFactory.cs	(working copy)
>@@ -56,6 +56,11 @@
> 					as IRangeValueProvider;
> 			if (rangeValueProvider != null)
> 				return new RangeValueProviderTextImplementor (adapter, rangeValueProvider);
>+
>+			if (UIAWinformsTextPropertyTextImplementor.IsUIAWinformsControlProvider (prov))
>+			{
>+				return new UIAWinformsTextPropertyTextImplementor (adapter, prov);
>+			}
> 			
> 			return new NamePropertyTextImplementor (adapter, prov);
> 		}
>Index: UiaAtkBridge/UIAWinformsTextPropertyTextImplementor.cs
>===================================================================
>--- UiaAtkBridge/UIAWinformsTextPropertyTextImplementor.cs	(revision 0)
>+++ UiaAtkBridge/UIAWinformsTextPropertyTextImplementor.cs	(revision 0)
>@@ -0,0 +1,94 @@
>+// 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: 
>+//      Matt Guo <matt@mattguo.com>
>+//
>+
>+using System;
>+using System.Reflection;
>+using Mono.UIAutomation.Bridge;
>+using System.Windows.Automation;
>+using System.Windows.Automation.Text;
>+using System.Windows.Automation.Provider;
>+
>+namespace UiaAtkBridge
>+{
>+	internal class UIAWinformsTextPropertyTextImplementor : BaseTextImplementor
>+	{
>+#region Public Properties
>+		public override string Text {
>+			get {
>+				var controlPropValue = GetPublicPropertyValue (provider, "Control");
>+				if (controlPropValue != null)
>+					return GetPublicPropertyValue (controlPropValue, "Text") as string;
>+				else
>+					return null;					
>+			}
>+		}
>+#endregion
>+
>+#region Public Methods
>+		public UIAWinformsTextPropertyTextImplementor (Adapter resource, IRawElementProviderSimple provider)
>+			: base (resource)
>+		{
>+			this.provider = provider;
>+		}
>+
>+		public static bool IsUIAWinformsControlProvider (IRawElementProviderSimple provider)
>+		{
>+			const string uiaWinformsAssemblyName =
>+				"UIAutomationWinforms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f4ceacb585d99812";
>+			var assembly = provider.GetType().Assembly;
>+			if (assembly.FullName == uiaWinformsAssemblyName)
>+			{
>+				const string baseProviderName = "Mono.UIAutomation.Winforms.SimpleControlProvider";
>+				Type baseProvider = assembly.GetType (baseProviderName);
>+				if (baseProvider != null && baseProvider.IsInstanceOfType (provider))
>+				{
>+					var controlPropValue = GetPublicPropertyValue (provider, "Control");
>+					if (controlPropValue != null)
>+						return true;
>+				}
>+			}
>+			return false;
>+		}
>+#endregion
>+
>+#region Private Methods
>+		private static object GetPublicPropertyValue (object obj, string propName)
>+	        {
>+	            Type referenceType = obj.GetType ();
>+	            PropertyInfo propertyInfo = referenceType.GetProperty (propName,
>+	                                                                   BindingFlags.Public
>+	                                                                   | BindingFlags.Instance
>+	                                                                   | BindingFlags.GetProperty);
>+	            if (propertyInfo == null)
>+	                throw new NotSupportedException ("Property not found: " + propName);
>+	            return propertyInfo.GetGetMethod ().Invoke (obj, new object[] { });
>+	        }
>+#endregion
>+				
>+#region Private Fields
>+		private IRawElementProviderSimple provider;
>+#endregion
>+	}
>+}
>Index: UiaAtkBridge/Makefile.am
>===================================================================
>--- UiaAtkBridge/Makefile.am	(revision 137312)
>+++ UiaAtkBridge/Makefile.am	(working copy)
>@@ -108,6 +108,7 @@
> 	TopLevelRootItem.cs \
> 	Tree.cs \
> 	TreeItem.cs \
>+	UIAWinformsTextPropertyTextImplementor.cs \
> 	ValueProviderTextImplementor.cs \
> 	Window.cs \
> 	WrapperPanel.cs
>Index: UiaAtkBridge/UiaAtkBridge.mdp
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge.mdp	(revision 137312)
>+++ UiaAtkBridge/UiaAtkBridge.mdp	(working copy)
>@@ -87,6 +87,7 @@
>     <File name="ToolBar.cs" subtype="Code" buildaction="Compile" />
>     <File name="ContextMenuWindow.cs" subtype="Code" buildaction="Compile" />
>     <File name="TabPage.cs" subtype="Code" buildaction="Compile" />
>+    <File name="UIAWinformsTextPropertyTextImplementor.cs" subtype="Code" buildaction="Compile" />
>   </Contents>
>   <References>
>     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

Actions: View | Diff

Attachments on bug 513057: 298006 | 303386