From 47dd119c76d6315aea511a1dbd90289a48c9dfbf Mon Sep 17 00:00:00 2001
From: shibakaneki <didier@sente.ch>
Date: Mon, 10 Sep 2012 09:37:26 +0200
Subject: [PATCH] Modified placeholder management in teacherguide

---
 src/gui/UBTeacherGuideWidgetsTools.cpp | 50 +++++++++++++-------------
 src/gui/UBTeacherGuideWidgetsTools.h   |  7 +++-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp
index 4456b243..b71bf82f 100644
--- a/src/gui/UBTeacherGuideWidgetsTools.cpp
+++ b/src/gui/UBTeacherGuideWidgetsTools.cpp
@@ -148,30 +148,10 @@ void UBTGAdaptableText::setPlaceHolderText(QString text)
     setPlainText(mPlaceHolderText);
 }
 
-void UBTGAdaptableText::keyPressEvent(QKeyEvent* e)
-{
-    if(isReadOnly()){
-        // this is important if you set a placeholder. In this case even if the text field is readonly the
-        // keypressed event came here. So if you don't ignore it you'll have a flick on the text zone
-        e->ignore();
-        return;
-    }
-
-    if(toPlainText() == mPlaceHolderText){
-        setPlainText("");
-    }
-    setTextColor(QColor(Qt::black));
-    QTextEdit::keyPressEvent(e);
-}
-
 void UBTGAdaptableText::keyReleaseEvent(QKeyEvent* e)
 {
     QTextEdit::keyReleaseEvent(e);
 
-    if(toPlainText().isEmpty()){
-        setTextColor(QColor(Qt::lightGray));
-        setPlainText(mPlaceHolderText);
-    }
     if(mMaximumLength && toPlainText().length()>mMaximumLength){
         setPlainText(toPlainText().left(mMaximumLength));
         QTextCursor tc(document());
@@ -183,8 +163,10 @@ void UBTGAdaptableText::keyReleaseEvent(QKeyEvent* e)
 void UBTGAdaptableText::showEvent(QShowEvent* e)
 {
     Q_UNUSED(e);
-    if(!mIsUpdatingSize && mHasPlaceHolder && toPlainText().isEmpty())
-        setPlainText(mPlaceHolderText);
+    if(!mIsUpdatingSize && mHasPlaceHolder && toPlainText().isEmpty()){
+    	setTextColor(QColor(Qt::lightGray));
+    	setPlainText(mPlaceHolderText);
+    }
     else
     	// If the teacherguide is collapsed, don't updated the size. Or set the size as the expanded size
         onTextChanged();
@@ -201,9 +183,7 @@ QString UBTGAdaptableText::text()
 
 void UBTGAdaptableText::onTextChanged()
 {
-	//qDebug() << ">> onTextChanged CALLED!";
     qreal documentSize = document()->size().height();
-    //qDebug() << ">>  documentSize: " << documentSize << ", height: " << height();
     if(height() == documentSize + mBottomMargin){
     	return;
     }
@@ -248,6 +228,28 @@ void UBTGAdaptableText::bottomMargin(int newValue)
     onTextChanged();
 }
 
+void UBTGAdaptableText::focusInEvent(QFocusEvent* e){
+	if(isReadOnly()){
+		e->ignore();
+	}
+	managePlaceholder();
+	QTextEdit::focusInEvent(e);
+}
+
+void UBTGAdaptableText::focusOutEvent(QFocusEvent* e){
+	if(toPlainText().isEmpty()){
+		setTextColor(QColor(Qt::lightGray));
+		setPlainText(mPlaceHolderText);
+	}
+	QTextEdit::focusOutEvent(e);
+}
+
+void UBTGAdaptableText::managePlaceholder(){
+	if(toPlainText() == mPlaceHolderText){
+		setTextColor(QColor(Qt::black));
+		setPlainText("");
+	}
+}
 
 /***************************************************************************
  *                      class   UBTGDraggableWeb                           *
diff --git a/src/gui/UBTeacherGuideWidgetsTools.h b/src/gui/UBTeacherGuideWidgetsTools.h
index 2f87ccfd..364f3d99 100644
--- a/src/gui/UBTeacherGuideWidgetsTools.h
+++ b/src/gui/UBTeacherGuideWidgetsTools.h
@@ -26,6 +26,8 @@
 #include <QMimeData>
 #include <QStackedWidget>
 #include <QWebView>
+#include <QFocusEvent>
+#include <QMouseEvent>
 
 #include "customWidgets/UBMediaWidget.h"
 
@@ -103,11 +105,14 @@ public slots:
     void onTextChanged();
 
 protected:
-    void keyPressEvent(QKeyEvent* e);
     void keyReleaseEvent(QKeyEvent* e);
     void showEvent(QShowEvent* e);
+    void focusInEvent(QFocusEvent* e);
+    void focusOutEvent(QFocusEvent* e);
 
 private:
+    void managePlaceholder();
+
     int mBottomMargin;
     QTreeWidgetItem* mpTreeWidgetItem;
     int mMinimumHeight;