github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-29 19:20:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More changes which MIGHT fix bug #3557508

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1996 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-08-16 05:14:39 +00:00
parent ef8bdfba88
commit e5e6b3bd43
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Greenshot/Helpers/IECaptureHelper.cs
View file

@ -338,9 +338,13 @@ namespace Greenshot.Helpers {
capture.Elements.Clear(); capture.Elements.Clear();
CaptureElement documentCaptureElement = documentContainer.CreateCaptureElements(pageSize); CaptureElement documentCaptureElement = documentContainer.CreateCaptureElements(pageSize);
foreach(DocumentContainer frameDocument in documentContainer.Frames) { foreach(DocumentContainer frameDocument in documentContainer.Frames) {
CaptureElement frameCaptureElement = frameDocument.CreateCaptureElements(Size.Empty); try {
if (frameCaptureElement != null) { CaptureElement frameCaptureElement = frameDocument.CreateCaptureElements(Size.Empty);
documentCaptureElement.Children.Add(frameCaptureElement); if (frameCaptureElement != null) {
documentCaptureElement.Children.Add(frameCaptureElement);
}
} catch (Exception ex) {
LOG.Warn("An error occurred while creating the capture elements: ", ex);
} }
} }
capture.AddElement(documentCaptureElement); capture.AddElement(documentCaptureElement);

7
Greenshot/Helpers/IEInterop/IEContainer.cs
View file

@ -368,7 +368,12 @@ namespace Greenshot.Helpers.IEInterop {
/// <returns></returns> /// <returns></returns>
public CaptureElement CreateCaptureElements(Size documentSize) { public CaptureElement CreateCaptureElements(Size documentSize) {
LOG.DebugFormat("CreateCaptureElements for {0}", Name); LOG.DebugFormat("CreateCaptureElements for {0}", Name);
IHTMLElement baseElement = document3.documentElement as IHTMLElement; IHTMLElement baseElement;
if (!isDTD) {
baseElement = document2.body;
} else {
baseElement = document3.documentElement;
}
IHTMLElement2 baseElement2 = baseElement as IHTMLElement2; IHTMLElement2 baseElement2 = baseElement as IHTMLElement2;
IHTMLRect htmlRect = baseElement2.getBoundingClientRect(); IHTMLRect htmlRect = baseElement2.getBoundingClientRect();
if (Size.Empty.Equals(documentSize)) { if (Size.Empty.Equals(documentSize)) {