Mercurial > hg > easyhg-kdiff3
changeset 27:1ed6a356f3f6
Avoid QWidget::setFont() in paintEvent()
| author | joachim99 |
|---|---|
| date | Sat, 11 Oct 2003 12:48:31 +0000 |
| parents | 07416314eb5e |
| children | 675b2ed580b2 |
| files | kdiff3/src/difftextwindow.cpp kdiff3/src/mergeresultwindow.cpp |
| diffstat | 2 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/kdiff3/src/difftextwindow.cpp Sat Oct 11 12:45:25 2003 +0000 +++ b/kdiff3/src/difftextwindow.cpp Sat Oct 11 12:48:31 2003 +0000 @@ -17,9 +17,11 @@ /*************************************************************************** * $Log$ + * Revision 1.2 2003/10/11 12:47:09 joachim99 + * Avoid QWidget::setFont() in paintEvent() + * * Revision 1.1 2003/10/06 18:38:48 joachim99 * KDiff3 version 0.9.70 - * * ***************************************************************************/ #include <iostream> @@ -38,7 +40,6 @@ #define leftInfoWidth (4+m_lineNumberWidth) // Nr of information columns on left side -//using namespace std; DiffTextWindow::DiffTextWindow( QWidget* pParent, @@ -58,6 +59,8 @@ m_pStatusBar = pStatusBar; m_bPaintingAllowed = true; + + setFont(m_pOptionDialog->m_font); } @@ -668,11 +671,6 @@ } m_cDiffBoth = m_pOptionDialog->m_colorForConflict; // Conflict color - if (font() != m_pOptionDialog->m_font ) - { - setFont(m_pOptionDialog->m_font); - } - bool bOldSelectionContainsData = selection.bSelectionContainsData; selection.bSelectionContainsData = false;
--- a/kdiff3/src/mergeresultwindow.cpp Sat Oct 11 12:45:25 2003 +0000 +++ b/kdiff3/src/mergeresultwindow.cpp Sat Oct 11 12:48:31 2003 +0000 @@ -17,9 +17,11 @@ /*************************************************************************** * $Log$ + * Revision 1.2 2003/10/11 12:48:31 joachim99 + * Avoid QWidget::setFont() in paintEvent() + * * Revision 1.1 2003/10/06 18:38:48 joachim99 * KDiff3 version 0.9.70 - * * ***************************************************************************/ #include "diff.h" @@ -76,6 +78,7 @@ m_selection.reset(); setMinimumSize( QSize(20,20) ); + setFont( m_pOptionDialog->m_font ); } void MergeResultWindow::init( @@ -1060,10 +1063,6 @@ if (m_pDiff3LineList==0) return; bool bOldSelectionContainsData = m_selection.bSelectionContainsData; - if (font() != m_pOptionDialog->m_font ) - { - setFont( m_pOptionDialog->m_font ); - } const QFontMetrics& fm = fontMetrics(); int fontHeight = fm.height(); int fontWidth = fm.width("W");