Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
Anatoly Mihalchenko 12 years ago
commit 9b8694c9bf
  1. 6
      src/adaptors/UBSvgSubsetAdaptor.cpp
  2. 8
      src/domain/UBGraphicsTextItemDelegate.cpp

@ -2769,6 +2769,12 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
} }
} }
QTextCursor curCursor = textItem->textCursor();
QTextCharFormat format;
format.setFont(font);
curCursor.mergeCharFormat(format);
textItem->setTextCursor(curCursor);
textItem->setFont(font); textItem->setFont(font);
QStringRef fill = mXmlReader.attributes().value("color"); QStringRef fill = mXmlReader.attributes().value("color");

@ -322,6 +322,12 @@ void UBGraphicsTextItemDelegate::positionHandles()
void UBGraphicsTextItemDelegate::ChangeTextSize(qreal factor, textChangeMode changeMode) void UBGraphicsTextItemDelegate::ChangeTextSize(qreal factor, textChangeMode changeMode)
{ {
if (scaleSize == changeMode)
{
if (1 == factor)
return;
}
else
if (0 == factor) if (0 == factor)
return; return;
@ -419,4 +425,4 @@ QVariant UBGraphicsTextItemDelegate::itemChange(QGraphicsItem::GraphicsItemChang
} }
} }
return UBGraphicsItemDelegate::itemChange(change, value); return UBGraphicsItemDelegate::itemChange(change, value);
} }

Loading…
Cancel
Save