4 files changed, 31 insertions, 22 deletions

diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index f38765b..8d294f8 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -203,25 +203,4 @@ Item {
             (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
         font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
     }
-
-    Image {
-        source: "content/pics/fingerpoint.png"
-        opacity: finger.pressed ? 0 : 1
-        x: finger.mouseX-16
-        y: finger.mouseY-16
-    }
-
-    Image {
-        source: "content/pics/fingerpoint-pressed.png"
-        opacity: finger.pressed ? 1.0 : 0.0
-        x: finger.mouseX-16
-        y: finger.mouseY-16
-    }
-
-    MouseRegion {
-        // this region is just to show where the finger is (good for videos)
-        id: finger
-        absorb: false
-        anchors.fill: parent
-    }
 }
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 74c9b5b..35b1173 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -430,6 +430,26 @@ void QFxTextEdit::setCursorVisible(bool on)
     d->control->processEvent(&focusEvent, QPointF(0, 0));
 }
 
+/*!
+    \qmlproperty bool TextEdit::focusOnPress
+
+    Whether the TextEdit should gain focus on a mouse press. By default this is
+    set to false;
+*/
+bool QFxTextEdit::focusOnPress() const
+{
+    Q_D(const QFxTextEdit);
+    return d->focusOnPress;
+}
+
+void QFxTextEdit::setFocusOnPress(bool on)
+{
+    Q_D(QFxTextEdit);
+    if (d->focusOnPress == on)
+        return;
+    d->focusOnPress = on;
+}
+
 void QFxTextEdit::geometryChanged(const QRectF &newGeometry, 
                                   const QRectF &oldGeometry)
 {
@@ -643,6 +663,7 @@ void QFxTextEdit::keyReleaseEvent(QKeyEvent *event)
 void QFxTextEdit::focusChanged(bool hasFocus)
 {
     Q_D(QFxTextEdit);
+    setCursorVisible(hasFocus);
 }
 
 /*!
@@ -684,6 +705,8 @@ Handles the given mouse \a event.
 void QFxTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QFxTextEdit);
+    if (d->focusOnPress)
+        setFocus(true);
     QMouseEvent *me = sceneMouseEventToMouseEvent(event);
     d->control->processEvent(me, QPointF(0, 0));
     event->setAccepted(me->isAccepted());
diff --git a/src/declarative/fx/qfxtextedit.h b/src/declarative/fx/qfxtextedit.h
index 5d95cd1..0aaa17b 100644
--- a/src/declarative/fx/qfxtextedit.h
+++ b/src/declarative/fx/qfxtextedit.h
@@ -77,6 +77,7 @@ class Q_DECLARATIVE_EXPORT QFxTextEdit : public QFxPaintedItem
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat)
     Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
     Q_PROPERTY(bool cursorVisible READ isCursorVisible WRITE setCursorVisible)
+    Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress)
     Q_CLASSINFO("DefaultProperty", "text")
 
 public:
@@ -127,6 +128,9 @@ public:
     bool isCursorVisible() const;
     void setCursorVisible(bool on);
 
+    bool focusOnPress() const;
+    void setFocusOnPress(bool on);
+
     virtual void dump(int depth);
     virtual QString propertyInfo() const;
 
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index dd2a1bf..a9b7237 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -68,7 +68,9 @@ class QFxTextEditPrivate : public QFxPaintedItemPrivate
 
 public:
     QFxTextEditPrivate()
-      : font(0), color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop), dirty(false), wrap(false), richText(false), cursorVisible(false), format(QFxTextEdit::AutoText), document(0)
+      : font(0), color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop),
+      dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(false),
+      format(QFxTextEdit::AutoText), document(0)
     {
     }
 
@@ -95,6 +97,7 @@ public:
     bool wrap;
     bool richText;
     bool cursorVisible;
+    bool focusOnPress;
     QFxTextEdit::TextFormat format;
     QTextDocument *document;
     QTextControl *control;