diff options
| author |  wodim | 2016-06-24 21:06:33 +0200 |
|---|---|---|
| committer | wodim | 2016-06-24 21:06:33 +0200 |
| commit | b612e36ce2581fdf1f0df5e4bee99bcc70cc548c (patch) | |
| tree | cfff40413458f5e2adab00f7bad98f7a7fd0f111 /src | |
| parent | KviIrcView_loghandling: add spaces to logging after timestamps (#2018) (diff) | |
| download | KVIrc-b612e36ce2581fdf1f0df5e4bee99bcc70cc548c.tar.gz KVIrc-b612e36ce2581fdf1f0df5e4bee99bcc70cc548c.tar.bz2 KVIrc-b612e36ce2581fdf1f0df5e4bee99bcc70cc548c.zip | |
Use proper bold fonts in the ircview
Fixes #2022
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/KviIrcView.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp index 7d2f16988..df7c61c46 100644 --- a/src/kvirc/ui/KviIrcView.cpp +++ b/src/kvirc/ui/KviIrcView.cpp @@ -1343,6 +1343,9 @@ void KviIrcView::paintEvent(QPaintEvent * p) theWdth = width() - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER + scrollbarWidth); \ pa.fillRect(curLeftCoord, curBottomCoord - m_iFontLineSpacing + m_iFontDescent, theWdth, m_iFontLineSpacing, KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_SELECT).back())); \ } \ + pPenFont.setStyle(curItalic ? QFont::StyleItalic : QFont::StyleNormal); \ + pPenFont.setBold(curBold); \ + pa.setFont(pPenFont); \ pa.drawText(curLeftCoord, curBottomCoord, _text_str.mid(_text_idx, _text_len)); \ curLeftCoord += _text_width; @@ -1355,12 +1358,10 @@ void KviIrcView::paintEvent(QPaintEvent * p) theWdth = width() - (curLeftCoord + KVI_IRCVIEW_HORIZONTAL_BORDER + scrollbarWidth); \ pa.fillRect(curLeftCoord, curBottomCoord - m_iFontLineSpacing + m_iFontDescent, theWdth, m_iFontLineSpacing, KVI_OPTION_MIRCCOLOR((unsigned char)curBack)); \ } \ - newFont = pa.font(); \ - newFont.setStyle(curItalic ? QFont::StyleItalic : QFont::StyleNormal); \ - pa.setFont(newFont); \ + pPenFont.setStyle(curItalic ? QFont::StyleItalic : QFont::StyleNormal); \ + pPenFont.setBold(curBold); \ + pa.setFont(pPenFont); \ pa.drawText(curLeftCoord, curBottomCoord, _text_str.mid(_text_idx, _text_len)); \ - if(curBold) \ - pa.drawText(curLeftCoord + 1, curBottomCoord, _text_str.mid(_text_idx, _text_len)); \ if(curUnderline) \ { \ int theWdth = _text_width; \ @@ -1381,6 +1382,7 @@ void KviIrcView::paintEvent(QPaintEvent * p) if(m_bMouseIsDown) { + QFont pPenFont = pa.font(); // Check if the block or a part of it is selected if(checkSelectionBlock(pCurTextLine, i)) { @@ -1503,6 +1505,7 @@ void KviIrcView::paintEvent(QPaintEvent * p) newFont = pa.font(); newFont.setStyle(curItalic ? QFont::StyleItalic : QFont::StyleNormal); + newFont.setBold(curBold); pa.setFont(newFont); if(curLink) @@ -1512,12 +1515,6 @@ void KviIrcView::paintEvent(QPaintEvent * p) pa.drawText(curLeftCoord + 1, curBottomCoord, pCurTextLine->szText.mid(block->block_start, block->block_len)); pa.drawLine(curLeftCoord, curBottomCoord + 2, curLeftCoord + wdth, curBottomCoord + 2); } - else if(curBold) - { - // Draw doubled font (simulate bold) - pa.drawText(curLeftCoord, curBottomCoord, pCurTextLine->szText.mid(block->block_start, block->block_len)); - pa.drawText(curLeftCoord + 1, curBottomCoord, pCurTextLine->szText.mid(block->block_start, block->block_len)); - } else { pa.drawText(curLeftCoord, curBottomCoord, pCurTextLine->szText.mid(block->block_start, block->block_len)); |