Commit 8148ac76 authored by Claudio Valerio's avatar Claudio Valerio

text can be resized until a minimum size is reached

parent 6fe52f69
...@@ -215,9 +215,12 @@ void UBGraphicsTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem ...@@ -215,9 +215,12 @@ void UBGraphicsTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
if (widget == UBApplication::boardController->controlView()->viewport() && if (widget == UBApplication::boardController->controlView()->viewport() &&
!isSelected() && toPlainText().isEmpty()) !isSelected() && toPlainText().isEmpty())
{ {
QFontMetrics fm(font());
setTextWidth(fm.width(mTypeTextHereLabel));
painter->setFont(font()); painter->setFont(font());
painter->setPen(UBSettings::paletteColor); painter->setPen(UBSettings::paletteColor);
painter->drawText(boundingRect(), Qt::AlignCenter, mTypeTextHereLabel); painter->drawText(boundingRect(), Qt::AlignCenter, mTypeTextHereLabel);
setTextInteractionFlags(Qt::NoTextInteraction);
} }
} }
...@@ -246,10 +249,6 @@ void UBGraphicsTextItem::copyItemParameters(UBItem *copy) const ...@@ -246,10 +249,6 @@ void UBGraphicsTextItem::copyItemParameters(UBItem *copy) const
cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType)); cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked)); cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
cp->setData(UBGraphicsItemData::ItemEditable, data(UBGraphicsItemData::ItemEditable).toBool()); cp->setData(UBGraphicsItemData::ItemEditable, data(UBGraphicsItemData::ItemEditable).toBool());
// cp->setDefaultTextColor(this->defaultTextColor());
// cp->setFont(this->font());
// cp->setColorOnDarkBackground(this->colorOnDarkBackground());
// cp->setColorOnLightBackground(this->colorOnLightBackground());
cp->setTextWidth(this->textWidth()); cp->setTextWidth(this->textWidth());
cp->setTextHeight(this->textHeight()); cp->setTextHeight(this->textHeight());
...@@ -275,15 +274,9 @@ QPainterPath UBGraphicsTextItem::shape() const ...@@ -275,15 +274,9 @@ QPainterPath UBGraphicsTextItem::shape() const
void UBGraphicsTextItem::setTextWidth(qreal width) void UBGraphicsTextItem::setTextWidth(qreal width)
{ {
QFontMetrics fm(font()); QFontMetrics fm(font());
qreal strictMin = fm.height(); qreal strictMin = 155; // the size of the font customization panel
qreal newWidth = qMax(strictMin, width); qreal newWidth = qMax(strictMin, width);
if (toPlainText().isEmpty())
{
qreal minWidth = fm.width(mTypeTextHereLabel);
newWidth = qMax(minWidth, newWidth);
}
QGraphicsTextItem::setTextWidth(newWidth); QGraphicsTextItem::setTextWidth(newWidth);
} }
...@@ -313,7 +306,7 @@ void UBGraphicsTextItem::contentsChanged() ...@@ -313,7 +306,7 @@ void UBGraphicsTextItem::contentsChanged()
if (toPlainText().isEmpty()) if (toPlainText().isEmpty())
{ {
setTextWidth(textWidth()); resize(textWidth(),textHeight());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment