kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-22 17:50:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correction du bug #26 : QET compile de nouveau avec Qt 4.4

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@745 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2009-08-31 21:26:08 +00:00
parent a15ca782c2
commit a9afeadad5
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/editor/parttext.cpp
View File

@@ -31,7 +31,9 @@ PartText::PartText(QETElementEditor *editor, QGraphicsItem *parent, ElementScene
QGraphicsTextItem(parent, scene), QGraphicsTextItem(parent, scene),
CustomElementPart(editor) CustomElementPart(editor)
{ {
#if QT_VERSION >= 0x040500
document() -> setDocumentMargin(1.0); document() -> setDocumentMargin(1.0);
#endif
setDefaultTextColor(Qt::black); setDefaultTextColor(Qt::black);
setFont(QETApp::diagramTextsFont()); setFont(QETApp::diagramTextsFont());
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
@@ -116,11 +118,20 @@ void PartText::setPos(qreal x, qreal y) {
QPointF PartText::margin() const { QPointF PartText::margin() const {
QFont used_font = font(); QFont used_font = font();
QFontMetrics qfm(used_font); QFontMetrics qfm(used_font);
// marge du texte
#if QT_VERSION >= 0x040500
qreal document_margin = document() -> documentMargin();
#else
// il semblerait qu'avant Qt 4.5, ceci vaille non pas 4.0 mais 2.0
qreal document_margin = 2.0;
#endif
QPointF margin( QPointF margin(
// marge autour du texte // marge autour du texte
document() -> documentMargin(), document_margin,
// marge au-dessus du texte + distance entre le plafond du texte et la baseline // marge au-dessus du texte + distance entre le plafond du texte et la baseline
document() -> documentMargin() + qfm.ascent() document_margin + qfm.ascent()
); );
return(margin); return(margin);
} }