equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
8 ** |
8 ** |
3994 // myFont may not have any "hard" flags set. We override |
3994 // myFont may not have any "hard" flags set. We override |
3995 // the point size so that when it is resolved against the device, this font will win. |
3995 // the point size so that when it is resolved against the device, this font will win. |
3996 // This is mainly to handle cases where someone sets the font on the window |
3996 // This is mainly to handle cases where someone sets the font on the window |
3997 // and then the combo inherits it and passes it onward. At that point the resolve mask |
3997 // and then the combo inherits it and passes it onward. At that point the resolve mask |
3998 // is very, very weak. This makes it stonger. |
3998 // is very, very weak. This makes it stonger. |
3999 myFont.setPointSizeF(mi->font.pointSizeF()); |
3999 myFont.setPointSizeF(QFontInfo(mi->font).pointSizeF()); |
4000 p->setFont(myFont); |
4000 p->setFont(myFont); |
4001 p->drawText(xpos, yPos, contentRect.width() - xm - tabwidth + 1, |
4001 p->drawText(xpos, yPos, contentRect.width() - xm - tabwidth + 1, |
4002 contentRect.height(), text_flags ^ Qt::AlignRight, s); |
4002 contentRect.height(), text_flags ^ Qt::AlignRight, s); |
4003 p->restore(); |
4003 p->restore(); |
4004 } |
4004 } |