mshtml and gecko_ia2 vbuf backends: Treat inline-block elements as inline elements...

Partial fix for #1378.

diff --git a/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp b/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp
index 9f1a26b..55b92fb 100755 (executable)
--- a/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp
+++ b/nvdaHelper/vbufBackends/gecko_ia2/gecko_ia2.cpp
@@ -448,7 +448,7 @@ VBufStorage_fieldNode_t* GeckoVBufBackend_t::fillVBuf(IAccessible2* pacc, VBufSt
                } else if((it=IA2AttribsMap.find(L"display"))!=IA2AttribsMap.end()) {\r
                        // If there is a display attribute, we can rely solely on this to determine whether this is a block element or not.\r
                        DEBUG_MSG(L"IA2Attributes contains display, value "<<it->second);\r
-                       isBlockElement=(it->second!=L"inline");\r
+                       isBlockElement=(it->second!=L"inline"&&it->second!=L"inline-block");\r
                } else if((it=IA2AttribsMap.find(L"formatting"))!=IA2AttribsMap.end()&&it->second==L"block") {\r
                        DEBUG_MSG(L"IA2Attributes contains formatting:block, this is a block element");\r
                        isBlockElement=TRUE;\r

diff --git a/nvdaHelper/vbufBackends/mshtml/mshtml.cpp b/nvdaHelper/vbufBackends/mshtml/mshtml.cpp
index ba254e1..378b40a 100755 (executable)
--- a/nvdaHelper/vbufBackends/mshtml/mshtml.cpp
+++ b/nvdaHelper/vbufBackends/mshtml/mshtml.cpp
@@ -296,7 +296,7 @@ inline void getCurrentStyleInfoFromHTMLDOMNode(IHTMLDOMNode* pHTMLDOMNode, bool&
        if(tempBSTR) {\r
                DEBUG_MSG(L"Got display");\r
                if (_wcsicmp(tempBSTR,L"none")==0) invisible=true;\r
-               if (_wcsicmp(tempBSTR,L"inline")==0) isBlock=false;\r
+               if (_wcsicmp(tempBSTR,L"inline")==0||_wcsicmp(tempBSTR,L"inline-block")==0) isBlock=false;\r
                SysFreeString(tempBSTR);\r
                tempBSTR=NULL;\r
        } else {\r

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index 4b24c42..c2b4113 100644 (file)
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -11,6 +11,7 @@
 \r
 == Bug Fixes ==\r
 - Collapsing combo boxes in a virtual buffer when focus mode has been forced with NVDA+space no longer auto-switches back to browse mode. (#1386)\r
+- In Gecko (e.g. Firefox) and MSHTML (e.g. Internet Explorer) documents, NVDA now correctly renders certain text on the same line which was previously rendered on separate lines. (#1378)\r
 \r
  \r
 = 2011.1 =\r