Attachment 417085 Details for Bug 671580

[patch] Patch to fix some Orca issues

set-role-before-name.patch (text/plain), 2.42 KB, created by Michael Gorse on 2011-03-02 15:16:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gorse

Created: 2011-03-02 15:16:34 UTC

Size: 2.42 KB

patch

obsolete

>From cb2eae0d7ad3b6c4a237d30ca7e835fb0ae842e2 Mon Sep 17 00:00:00 2001
>From: mgorse <mgorse@localhost.(none)>
>Date: Tue, 1 Mar 2011 12:48:56 -0600
>Subject: [PATCH] [UiaAtkBridge] fix for BNC#671580: Set role before name
>
>---
> UiaAtkBridge/UiaAtkBridge/Adapter.cs          |   14 +++++++++-----
> UiaAtkBridge/UiaAtkBridge/MenuItem.cs         |    4 ++--
> UiaAtkBridge/UiaAtkBridge/TopLevelRootItem.cs |    2 +-
> 3 files changed, 12 insertions(+), 8 deletions(-)
>
>diff --git a/UiaAtkBridge/UiaAtkBridge/Adapter.cs b/UiaAtkBridge/UiaAtkBridge/Adapter.cs
>index 35f76ef..5902d4c 100644
>--- a/UiaAtkBridge/UiaAtkBridge/Adapter.cs
>+++ b/UiaAtkBridge/UiaAtkBridge/Adapter.cs
>@@ -155,11 +155,15 @@ namespace UiaAtkBridge
> 				return role;
> 			}
> 			set {
>-				role = value;
>-				GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>-					base.Role = value;
>-					return false;
>-				}));
>+				if (role == Atk.Role.Unknown) {
>+					role = base.Role = value;
>+				} else {
>+					role = value;
>+					GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+						base.Role = value;
>+						return false;
>+					}));
>+				}
> 			}
> 		}
> 
>diff --git a/UiaAtkBridge/UiaAtkBridge/MenuItem.cs b/UiaAtkBridge/UiaAtkBridge/MenuItem.cs
>index 65e689e..5589681 100644
>--- a/UiaAtkBridge/UiaAtkBridge/MenuItem.cs
>+++ b/UiaAtkBridge/UiaAtkBridge/MenuItem.cs
>@@ -52,6 +52,8 @@ namespace UiaAtkBridge
> 
> 			textExpert = TextImplementorFactory.GetImplementor (this, provider);
> 
>+			Role = Atk.Role.MenuItem;
>+
> 			string name = (string) provider.GetPropertyValue (AutomationElementIdentifiers.NameProperty.Id);
> 			if (!String.IsNullOrEmpty (name))
> 				Name = name;
>@@ -66,8 +68,6 @@ namespace UiaAtkBridge
> 				provider.GetPatternProvider (ExpandCollapsePatternIdentifiers.Pattern.Id);
> 
> 			actionExpert.Add ("click", "click", null, DoClick);
>-			
>-			Role = Atk.Role.MenuItem;
> 		}
> 
> 		protected MenuItem (IntPtr ptr)
>diff --git a/UiaAtkBridge/UiaAtkBridge/TopLevelRootItem.cs b/UiaAtkBridge/UiaAtkBridge/TopLevelRootItem.cs
>index 95ac411..7ba05d1 100644
>--- a/UiaAtkBridge/UiaAtkBridge/TopLevelRootItem.cs
>+++ b/UiaAtkBridge/UiaAtkBridge/TopLevelRootItem.cs
>@@ -37,8 +37,8 @@ namespace UiaAtkBridge
> 			//exception: TopLevelRootItem doesn't have an UIA counterpart
> 			: base (null)
> 		{
>-			this.Name = Monitor.GetProgramName ();
> 			this.Role = Atk.Role.Application;
>+			this.Name = Monitor.GetProgramName ();
> 		}
> 		
> 		private static volatile TopLevelRootItem instance = null;
>-- 
>1.7.3.4
>

Actions: View | Diff

Attachments on bug 671580: 417085