[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kviewshell
From:       Wilfried Huss <Wilfried.Huss () gmx ! at>
Date:       2005-04-18 15:18:41
Message-ID: 20050418151841.4E1C83C8 () office ! kde ! org
[Download RAW message or body]

CVS commit by whuss: 

Fix selections during text search, which was broken by my last commit.


  M +7 -1      documentWidget.cpp   1.12
  M +4 -4      kmultipage.cpp   1.76


--- kdegraphics/kviewshell/documentWidget.cpp  #1.11:1.12
@@ -286,5 +286,5 @@ void documentWidget::paintEvent(QPaintEv
 }
 
-void documentWidget::select(textSelection* selection)
+void documentWidget::select(textSelection* newSelection)
 {
   // Get a pointer to the page contents
@@ -295,4 +295,10 @@ void documentWidget::select(textSelectio
   }
 
+  Q_UINT16 oldPageNr = selection->getPageNumber();
+  selection->set(newSelection->getPageNumber(), \
newSelection->getSelectedTextStart(), newSelection->getSelectedTextEnd(), +           \
newSelection->getSelectedText()); +  if (oldPageNr != selection->getPageNumber())
+    connect(selection, SIGNAL(pageChanged(void)), this, \
SLOT(selectionPageChanged(void))); +
   selectedRegion = pageData->selectedRegion(selection);
   update();

--- kdegraphics/kviewshell/kmultipage.cpp  #1.75:1.76
@@ -1119,5 +1119,5 @@ void KMultiPage::gotoPage(int pageNr, in
 
   QString selectedText("");
-  for(int i = beginSelection; i < endSelection; i++) {
+  for(int i = beginSelection; i <= endSelection; i++) {
     selectedText += pageData->textLinkList[i].linkText;
     selectedText += "\n";
@@ -1136,9 +1136,9 @@ void KMultiPage::gotoPage(int pageNr, in
         kdError(4300) << "KMultiPage::select() while widgetList.size()=" << \
widgetList.size() << "and currentPageNumber()=" << currentPageNumber() << endl;  else
-        ((documentWidget \
*)widgetList[currentPageNumber()-1])->select(&userSelection); +        \
((documentWidget *)widgetList[pageNr-1])->select(&userSelection);  }
 
-  Q_UINT16 y = pageData->textLinkList[beginSelection].box.bottom();
-  goto_page(pageNr-1, y);
+  Q_UINT16 y = pageData->textLinkList[beginSelection].box.top();
+  goto_page(pageNr-1, y, false);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]