From 3180428f8a89cff7e866aa32f2c19eae2c5075ae Mon Sep 17 00:00:00 2001 From: WMJ Date: Sat, 31 Aug 2024 14:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=8D=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=B7=A6=E4=B8=8B=E9=9D=9E0=E6=88=AA?= =?UTF-8?q?=E5=8F=96=E6=A1=86=E6=97=B6=EF=BC=8C=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=9D=90=E6=A0=87=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Functions/Editor/PdfViewerControl.cs | 9 +++------ App/Functions/Editor/ViewerStructures.cs | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/App/Functions/Editor/PdfViewerControl.cs b/App/Functions/Editor/PdfViewerControl.cs index 4ad5ac9..7c94ee3 100644 --- a/App/Functions/Editor/PdfViewerControl.cs +++ b/App/Functions/Editor/PdfViewerControl.cs @@ -656,7 +656,7 @@ namespace PDFPatcher.Functions blockPen.DashStyle = spanPen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - using (var m = new System.Drawing.Drawing2D.Matrix(z, 0, 0, z, offset.X + o.X - z * b.Left, offset.Y + o.Y - z * b.Top)) { + using (var m = new System.Drawing.Drawing2D.Matrix(z, 0, 0, z, offset.X + o.X, offset.Y + o.Y)) { g.MultiplyTransform(m); } foreach (var block in p.TextPage.Blocks) { @@ -786,9 +786,6 @@ namespace PDFPatcher.Functions lock (_mupdf.SyncObj) { var page = _cache.LoadPage(region.Page); var pr = region.ToPageCoordinate(page); - if (pr.Intersect(page.VisualBound).IsEmpty) { - return null; - } if (pr.Intersect(page.TextPage.BBox).IsEmpty) { return null; } @@ -1013,8 +1010,8 @@ namespace PDFPatcher.Functions var o = _pageOffsets[pageNumber]; var b = _pageBounds[pageNumber]; var z = _zoomFactor; - var l = (box.Left - b.Left) * z + __pageMargin; - var t = (box.Top - b.Top) * z + __pageMargin; + var l = box.Left * z + __pageMargin; + var t = box.Top * z + __pageMargin; if (rtl) { l += o; } diff --git a/App/Functions/Editor/ViewerStructures.cs b/App/Functions/Editor/ViewerStructures.cs index 9692a4a..3b2e453 100644 --- a/App/Functions/Editor/ViewerStructures.cs +++ b/App/Functions/Editor/ViewerStructures.cs @@ -68,7 +68,7 @@ namespace PDFPatcher.Functions.Editor public MuPoint ToPageCoordinate(MuPage page) { var pb = page.VisualBound; - return new MuPoint(PageX, pb.Bottom - (PageY - pb.Top)); + return new MuPoint(PageX - pb.Left, pb.Bottom - PageY); } } @@ -94,9 +94,9 @@ namespace PDFPatcher.Functions.Editor var r = Region; var pb = page.VisualBound; return new MuRectangle(r.Left, - pb.Bottom - (r.Top - pb.Top), + pb.Bottom - r.Top, r.Right, - pb.Bottom - (r.Bottom - pb.Top)); + pb.Bottom - r.Bottom); } }