diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index cfa76117..03e5190d 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -1023,7 +1023,7 @@ void UBTeacherGuidePageZeroWidget::switchToMode(tUBTGZeroPageMode mode) QString inputStyleSheet("QTextEdit { background: white; border-radius: 10px; border: 2px;}"); mpModePushButton->hide(); mpSessionTitle->setReadOnly(false); - mpSessionTitle->managePlaceholder(false); + mpSessionTitle->managePlaceholder(true); mpSessionTitle->setStyleSheet(inputStyleSheet); QFont titleFont(QApplication::font().family(), 11, -1); mpSessionTitle->document()->setDefaultFont(titleFont); diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp index 7ecfbd27..c67b09a8 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.cpp +++ b/src/gui/UBTeacherGuideWidgetsTools.cpp @@ -24,6 +24,9 @@ #include #include #include +#include +#include +#include #include "UBTeacherGuideWidgetsTools.h" @@ -190,10 +193,11 @@ void UBTGAdaptableText::onTextChanged() mIsUpdatingSize = true; - if(documentSize < mMinimumHeight) - setFixedHeight(mMinimumHeight); - else - setFixedHeight(documentSize+mBottomMargin); + if(documentSize < mMinimumHeight){ + setFixedHeight(mMinimumHeight); + }else{ + setFixedHeight(documentSize+mBottomMargin); + } updateGeometry(); //to trig a resize on the tree widget item @@ -245,6 +249,7 @@ void UBTGAdaptableText::managePlaceholder(bool focus){ setTextColor(QColor(Qt::black)); setPlainText(""); } + setCursorToTheEnd(); }else{ if(toPlainText().isEmpty()){ setTextColor(QColor(Qt::lightGray)); @@ -253,6 +258,16 @@ void UBTGAdaptableText::managePlaceholder(bool focus){ } } +void UBTGAdaptableText::setCursorToTheEnd(){ + QTextDocument* doc = document(); + if(NULL != doc){ + QTextBlock block = doc->lastBlock(); + QTextCursor cursor(doc); + cursor.setPosition(block.position() + block.length() - 1); + setTextCursor(cursor); + } +} + /*************************************************************************** * class UBTGDraggableWeb * ***************************************************************************/ diff --git a/src/gui/UBTeacherGuideWidgetsTools.h b/src/gui/UBTeacherGuideWidgetsTools.h index 933bdd30..cd37fe2d 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.h +++ b/src/gui/UBTeacherGuideWidgetsTools.h @@ -112,6 +112,7 @@ protected: void focusOutEvent(QFocusEvent* e); private: + void setCursorToTheEnd(); int mBottomMargin; QTreeWidgetItem* mpTreeWidgetItem; int mMinimumHeight;