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

Take text height into account in the Add Widgets dialog.

Browse Source 
BUG: 157959

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=812491
This commit is contained in:
Jason Stubbs 2008-05-25 15:34:59 +00:00
parent 8c285fdee5
commit bfc47e7c3a
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
appletbrowser/kcategorizeditemsviewdelegate.cpp
View File

@ -69,6 +69,19 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter,
} }
} }
int KCategorizedItemsViewDelegate::calcItemHeight(const QStyleOptionViewItem &option) const
{
// Painting main column
QStyleOptionViewItem local_option_title(option);
QStyleOptionViewItem local_option_normal(option);
local_option_title.font.setBold(true);
local_option_title.font.setPointSize(local_option_title.font.pointSize() + 2);
int textHeight = QFontInfo(local_option_title.font).pixelSize() + QFontInfo(local_option_normal.font).pixelSize();
return qMax(textHeight, MAIN_ICON_SIZE) + 2 * UNIVERSAL_PADDING;
}
void KCategorizedItemsViewDelegate::paintColMain(QPainter *painter, void KCategorizedItemsViewDelegate::paintColMain(QPainter *painter,
const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const
{ {
@ -103,19 +116,20 @@ void KCategorizedItemsViewDelegate::paintColMain(QPainter *painter,
// Text // Text
int textInner = 2 * UNIVERSAL_PADDING + MAIN_ICON_SIZE; int textInner = 2 * UNIVERSAL_PADDING + MAIN_ICON_SIZE;
const int itemHeight = calcItemHeight(option);
p.setPen(foregroundColor); p.setPen(foregroundColor);
p.setFont(local_option_title.font); p.setFont(local_option_title.font);
p.drawText( p.drawText(
left + (leftToRight ? textInner : 0), left + (leftToRight ? textInner : 0),
top + UNIVERSAL_PADDING, top,
width - textInner, MAIN_ICON_SIZE / 2, width - textInner, itemHeight / 2,
Qt::AlignBottom | Qt::AlignLeft, title); Qt::AlignBottom | Qt::AlignLeft, title);
p.setFont(local_option_normal.font); p.setFont(local_option_normal.font);
p.drawText( p.drawText(
left + (leftToRight ? textInner : 0), left + (leftToRight ? textInner : 0),
top + UNIVERSAL_PADDING + MAIN_ICON_SIZE / 2, top + itemHeight / 2,
width - textInner, MAIN_ICON_SIZE / 2, width - textInner, itemHeight / 2,
Qt::AlignTop | Qt::AlignLeft, description); Qt::AlignTop | Qt::AlignLeft, description);
// Main icon // Main icon
@ -274,11 +288,8 @@ bool KCategorizedItemsViewDelegate::editorEvent(QEvent *event,
QSize KCategorizedItemsViewDelegate::sizeHint(const QStyleOptionViewItem &option, QSize KCategorizedItemsViewDelegate::sizeHint(const QStyleOptionViewItem &option,
const QModelIndex &index ) const const QModelIndex &index ) const
{ {
Q_UNUSED(option);
//Q_UNUSED(index);
int width = (index.column() == 0) ? 0 : FAV_ICON_SIZE; int width = (index.column() == 0) ? 0 : FAV_ICON_SIZE;
return QSize(width, MAIN_ICON_SIZE + 2 * UNIVERSAL_PADDING); return QSize(width, calcItemHeight(option));
} }
int KCategorizedItemsViewDelegate::columnWidth (int column, int viewWidth) const { int KCategorizedItemsViewDelegate::columnWidth (int column, int viewWidth) const {

2
appletbrowser/kcategorizeditemsviewdelegate_p.h
View File

@ -71,6 +71,8 @@ private:
const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const; const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const;
void paintColRemove(QPainter *painter, void paintColRemove(QPainter *painter,
const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const; const QStyleOptionViewItem &option, const KCategorizedItemsViewModels::AbstractItem * item) const;
int calcItemHeight(const QStyleOptionViewItem &option) const;
}; };
/** /**