Changeset 279 for trunk/src/PDFDocument.cxx

Timestamp:

06/26/07 07:07:49 (18 months ago)

Author:

jordi

Message:

Igor Vagulin sent a patch to change the Scroll and Text Selection ToggleAction? to RadioActions?.

Moved the implementation of PagePter?'s setMode() to its implementation file.

Fixed the selection of an empty rectangle.

Files:

• trunk/src/PDFDocument.cxx (modified) (4 diffs)

trunk/src/PDFDocument.cxx

@@ -657 +657 @@
 }
 
+static void
+repairEmpty(PopplerRectangle& rect)
+{
+    //rect must have be least 1x1
+    if(rect.y1 == rect.y2)
+        rect.y2++;
+    if(rect.x1 == rect.x2)
+        rect.x2++;
+}
+
 void 
 PDFDocument::setTextSelection (DocumentRectangle *rect)
@@ -670 +680 @@
     
     //for get text we must exchange y coordinate, don't ask me where logic here.
-    PopplerRectangle textRect = { rect->getX1(),
-                                  (pageHeight - rect->getY2()),
-                                  rect->getX2(),
-                                  (pageHeight - rect->getY1())};
+    PopplerRectangle textRect = { rect->getX1() / getZoom(),
+                                  (pageHeight - rect->getY2() / getZoom()),
+                                  rect->getX2() * getZoom() / getZoom(),
+                                  (pageHeight - rect->getY1() / getZoom())};
+    repairEmpty(textRect);
+
     gchar *text = poppler_page_get_text(page, &textRect);
     if(!text)
@@ -692 +704 @@
         g_free(text);
 }
+
 GdkRegion*
 PDFDocument::getTextRegion (DocumentRectangle *r)
@@ -705 +718 @@
     rect.y1 = r->getY1() / getZoom();
     rect.x2 = r->getX2() / getZoom();
-    rect.y2 = r->getY2() / getZoom();
+    rect.y2 = r->getY2() / getZoom();   
+    repairEmpty(rect);
 
     //calc selection size