diff options
| author |  Fabio Bas | 2010-03-07 16:15:00 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-03-07 16:15:00 +0000 |
| commit | 10c64071446094dc04f07e892b1614e588140690 (patch) | |
| tree | 49e67f4dfc17e74c6000628b123c2570618f09b2 | |
| parent | quick fixes at classeditor (diff) | |
| download | KVIrc-10c64071446094dc04f07e892b1614e588140690.tar.gz KVIrc-10c64071446094dc04f07e892b1614e588140690.tar.bz2 KVIrc-10c64071446094dc04f07e892b1614e588140690.zip | |
fixed KviTalItemDelegate height calculation in sizeHint()
Theme management dialog: double click to apply a theme (was single click)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4103 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvilib/tal/kvi_tal_itemdelegates.cpp | 9 | ||||
| -rw-r--r-- | src/modules/theme/managementdialog.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.cpp b/src/kvilib/tal/kvi_tal_itemdelegates.cpp index e905fd34f..8b51719a9 100644 --- a/src/kvilib/tal/kvi_tal_itemdelegates.cpp +++ b/src/kvilib/tal/kvi_tal_itemdelegates.cpp @@ -76,20 +76,21 @@ void KviTalIconAndRichTextItemDelegate::paint(QPainter * pPainter, const QStyleO QTextDocument doc; doc.setHtml(szText); - doc.setDefaultFont(pPainter->font()); + doc.setDefaultFont(option.font); pPainter->translate(option.rect.x()+iAfterIcon,option.rect.y()+LVI_BORDER); doc.setTextWidth(option.rect.width()-32); - QRect cliprect = QRect(QPoint(0,0),QSize(option.rect.width()-iAfterIcon,option.rect.height()-(LVI_BORDER*2)-4)); + QRect cliprect = QRect(QPoint(0,0),QSize(option.rect.width()-iAfterIcon,option.rect.height())); doc.drawContents(pPainter,cliprect); pPainter->restore(); } -QSize KviTalIconAndRichTextItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex & index) const +QSize KviTalIconAndRichTextItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex & index) const { QString szText = index.data(Qt::DisplayRole).toString(); QTextDocument doc; doc.setHtml(szText); - + doc.setDefaultFont(option.font); + doc.setTextWidth(option.rect.width()-32); int iHeight = doc.documentLayout()->documentSize().toSize().height(); if(iHeight < (LVI_ICON_SIZE+(2 * LVI_BORDER))) iHeight = LVI_ICON_SIZE; diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 30564d1dc..e61960864 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -179,7 +179,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent) m_pListWidget->setSelectionMode(QAbstractItemView::ExtendedSelection); m_pListWidget->setSortingEnabled(true); - connect(m_pListWidget,SIGNAL(itemActivated(QListWidgetItem *)),this,SLOT(applyTheme(QListWidgetItem *))); + connect(m_pListWidget,SIGNAL(itemDoubleClicked(QListWidgetItem *)),this,SLOT(applyTheme(QListWidgetItem *))); //FIXME tooltip //connect(m_pListWidget,SIGNAL(tipRequest(QListWidgetItem *,const QPoint &)),this,SLOT(tipRequest(QListWidgetItem *,const QPoint &))); |