Fixed some little things

preferencesAboutTextFull
shibakaneki 12 years ago
parent 1d06110b5e
commit 77aa2783a2
  1. 2
      src/gui/UBTeacherGuideWidget.cpp
  2. 19
      src/gui/UBTeacherGuideWidgetsTools.cpp
  3. 1
      src/gui/UBTeacherGuideWidgetsTools.h

@ -1023,7 +1023,7 @@ void UBTeacherGuidePageZeroWidget::switchToMode(tUBTGZeroPageMode mode)
QString inputStyleSheet("QTextEdit { background: white; border-radius: 10px; border: 2px;}"); QString inputStyleSheet("QTextEdit { background: white; border-radius: 10px; border: 2px;}");
mpModePushButton->hide(); mpModePushButton->hide();
mpSessionTitle->setReadOnly(false); mpSessionTitle->setReadOnly(false);
mpSessionTitle->managePlaceholder(false); mpSessionTitle->managePlaceholder(true);
mpSessionTitle->setStyleSheet(inputStyleSheet); mpSessionTitle->setStyleSheet(inputStyleSheet);
QFont titleFont(QApplication::font().family(), 11, -1); QFont titleFont(QApplication::font().family(), 11, -1);
mpSessionTitle->document()->setDefaultFont(titleFont); mpSessionTitle->document()->setDefaultFont(titleFont);

@ -24,6 +24,9 @@
#include <QApplication> #include <QApplication>
#include <QDomElement> #include <QDomElement>
#include <QWebFrame> #include <QWebFrame>
#include <QTextDocument>
#include <QTextBlock>
#include <QTextCursor>
#include "UBTeacherGuideWidgetsTools.h" #include "UBTeacherGuideWidgetsTools.h"
@ -190,10 +193,11 @@ void UBTGAdaptableText::onTextChanged()
mIsUpdatingSize = true; mIsUpdatingSize = true;
if(documentSize < mMinimumHeight) if(documentSize < mMinimumHeight){
setFixedHeight(mMinimumHeight); setFixedHeight(mMinimumHeight);
else }else{
setFixedHeight(documentSize+mBottomMargin); setFixedHeight(documentSize+mBottomMargin);
}
updateGeometry(); updateGeometry();
//to trig a resize on the tree widget item //to trig a resize on the tree widget item
@ -245,6 +249,7 @@ void UBTGAdaptableText::managePlaceholder(bool focus){
setTextColor(QColor(Qt::black)); setTextColor(QColor(Qt::black));
setPlainText(""); setPlainText("");
} }
setCursorToTheEnd();
}else{ }else{
if(toPlainText().isEmpty()){ if(toPlainText().isEmpty()){
setTextColor(QColor(Qt::lightGray)); 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 * * class UBTGDraggableWeb *
***************************************************************************/ ***************************************************************************/

@ -112,6 +112,7 @@ protected:
void focusOutEvent(QFocusEvent* e); void focusOutEvent(QFocusEvent* e);
private: private:
void setCursorToTheEnd();
int mBottomMargin; int mBottomMargin;
QTreeWidgetItem* mpTreeWidgetItem; QTreeWidgetItem* mpTreeWidgetItem;
int mMinimumHeight; int mMinimumHeight;

Loading…
Cancel
Save