Merge pull request #150 from kylixs/master

Fixes ActiveX control invalidateWindow rect
firebreath · Feb 8, 2015 · 532f906 · 532f906
2 parents 3497ccf + 37345c5
commit 532f906
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/ActiveXCore/FBControl.h b/src/ActiveXCore/FBControl.h
@@ -252,8 +252,15 @@ namespace FB {
                 boost::shared_ptr<FB::ShareableReference<CFBControlX> > ref(boost::make_shared<FB::ShareableReference<CFBControlX> >(this));
                 m_host->ScheduleOnMainThread(ref, boost::bind(&CFBControlX::invalidateWindow, this, left, top, right, bottom));
             } else {
-                if (m_spInPlaceSite)
-                    m_spInPlaceSite->InvalidateRect(NULL, TRUE);
+                if (m_spInPlaceSite){
+					if(pluginWin){
+						FB::Rect pos = pluginWin->getWindowPosition();
+						RECT r = { left+pos.left, top+pos.top, right+pos.left, bottom+pos.top };
+						m_spInPlaceSite->InvalidateRect(&r, FALSE);
+					}else {
+						m_spInPlaceSite->InvalidateRect(NULL, FALSE);
+					}
+				}
             }
         }