# HG changeset patch
# User joachim99
# Date 1065876511 0
# Node ID 1ed6a356f3f61d4e8eb7e6d82e8e91f962be175b
# Parent  07416314eb5e2dd37ed7c4cb3854cca8b676f9b4
Avoid QWidget::setFont() in paintEvent()

diff -r 07416314eb5e -r 1ed6a356f3f6 kdiff3/src/difftextwindow.cpp
--- 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;
 
diff -r 07416314eb5e -r 1ed6a356f3f6 kdiff3/src/mergeresultwindow.cpp
--- 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");