From 6734aaf55c604ad78f89644f56656d599be599f3 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Thu, 11 Nov 2010 15:25:25 +1000 Subject: [PATCH] nvdaHelper displayModel interface implementation of getWindowTextInRect: when collecting text from descendant windows, ignore windows that are invisible according to IsWindowVisible. This among other things stops text from other tabs bleeding through when reviewing a particular propertysheet in a multitabbed dialog (e.g. file / folder properties in Windows explorer). --- source/NVDAHelper/remote/displayModelRemote.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/NVDAHelper/remote/displayModelRemote.cpp b/source/NVDAHelper/remote/displayModelRemote.cpp index 534d748dab3..dd885b47417 100644 --- a/source/NVDAHelper/remote/displayModelRemote.cpp +++ b/source/NVDAHelper/remote/displayModelRemote.cpp @@ -35,6 +35,7 @@ error_status_t displayModelRemote_getWindowTextInRect(handle_t bindingHandle, co if(hasDescendantWindows) { tempModel=new displayModel_t; for(deque::reverse_iterator i=windowDeque.rbegin();i!=windowDeque.rend();++i) { + if(!IsWindowVisible(*i)) continue; displayModelsByWindow.acquire(); displayModelsMap_t::iterator j=displayModelsByWindow.find(*i); if(j!=displayModelsByWindow.end()) {