alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compare default text correctly

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=791246
This commit is contained in:
Chani Armitage 2008-03-28 21:11:57 +00:00
parent 7983ed5bb9
commit fb7a84644d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/lineedit.cpp
View File

@ -210,6 +210,7 @@ QSizeF LineEdit::sizeHint() const
void LineEdit::setDefaultText(const QString &text) void LineEdit::setDefaultText(const QString &text)
{ {
d->defaultText = text.simplified(); d->defaultText = text.simplified();
//FIXME hardcoded colours aren't nice
d->defaultText = QString("<font color=\"gray\">") + d->defaultText + QString("</font>"); d->defaultText = QString("<font color=\"gray\">") + d->defaultText + QString("</font>");
QGraphicsTextItem::setHtml(d->defaultText); QGraphicsTextItem::setHtml(d->defaultText);
d->defaultTextPlain = QGraphicsTextItem::toPlainText(); d->defaultTextPlain = QGraphicsTextItem::toPlainText();
@ -217,7 +218,9 @@ void LineEdit::setDefaultText(const QString &text)
const QString LineEdit::toHtml() const QString LineEdit::toHtml()
{ {
if (QGraphicsTextItem::toHtml() == d->defaultText) { //note: comparing html doesn't work because QGraphicsTextItem::toHtml() returns
//unpredictable text with lots of added html
if (QGraphicsTextItem::toPlainText() == d->defaultTextPlain) {
return QString(); return QString();
} else { } else {
return QGraphicsTextItem::toHtml(); return QGraphicsTextItem::toHtml();
@ -226,7 +229,7 @@ const QString LineEdit::toHtml()
const QString LineEdit::toPlainText() const QString LineEdit::toPlainText()
{ {
if (QGraphicsTextItem::toPlainText() == d->defaultText) { if (QGraphicsTextItem::toPlainText() == d->defaultTextPlain) {
return QString(); return QString();
} else { } else {
return QGraphicsTextItem::toPlainText(); return QGraphicsTextItem::toPlainText();