Changeset 846 for trunk/src/gui/widgets/qplaintextedit.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qplaintextedit.cpp (modified) (9 diffs)

trunk/src/gui/widgets/qplaintextedit.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -912 +912 @@
 
         if (moveCursor) {
+
             // move using movePosition to keep the cursor's x
             lastY += verticalOffset();
@@ -944 +945 @@
     if (!centerOnScroll && q->isVisible()) {
         QTextBlock block = doc->lastBlock();
-        const int visible = static_cast<int>(viewport->rect().height() - margin - 1);
-        int y = 0;
+        const ;
+         y = 0;
         int visibleFromBottom = 0;
 
@@ -953 +954 @@
                 continue;
             }
-            y += int(documentLayout->blockBoundingRect(block).height());
+            y += );
 
             QTextLayout *layout = block.layout();
@@ -962 +963 @@
                     QTextLine line = layout->lineAt(lineNumber);
                     const QRectF lr = line.naturalTextRect();
-                    if (int(lr.top()) >= y - visible)
+                    if () >= y - visible)
                         break;
                     ++lineNumber;
@@ -1320 +1321 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -1456 +1477 @@
     }
 #endif
+
     else if (e->type() == QEvent::Gesture) {
         QGestureEvent *ge = static_cast<QGestureEvent *>(e);
@@ -1479 +1501 @@
         return true;
     }
+
     return QAbstractScrollArea::event(e);
 }
@@ -2394 +2417 @@
 
     The default value depends on whether the QPlainTextEdit is read-only
-    or editable, and whether it is a QTextBrowser or not.
+    or editable.
 */