[QTerm-cvs] SF.net SVN: qterm:[1338] trunk/qterm/src/qtermscreen.cpp

[<hep...@us...>]

Revision: 1338
          http://sourceforge.net/p/qterm/code/1338
Author:   hephooey
Date:     2013-12-26 03:24:47 +0000 (Thu, 26 Dec 2013)
Log Message:
-----------
Use point size rather than pixel size, not sure it is correct thing to do. When the font size are scaled automatically this change has no effect.

Modified Paths:
--------------
    trunk/qterm/src/qtermscreen.cpp

Modified: trunk/qterm/src/qtermscreen.cpp
===================================================================
--- trunk/qterm/src/qtermscreen.cpp	2013-12-26 03:24:41 UTC (rev 1337)
+++ trunk/qterm/src/qtermscreen.cpp	2013-12-26 03:24:47 UTC (rev 1338)
@@ -292,21 +292,21 @@
 
 void Screen::updateFont()
 {
-    int nPixelSize;
+    int nPointSize;
     int nIniSize = qMax(8, qMin(m_rcClient.height() / m_pBuffer->line(),
                                 m_rcClient.width() * 2 / m_pBuffer->columns()));
 
-    for (nPixelSize = nIniSize - 3; nPixelSize <= nIniSize + 3; nPixelSize++) {
-        m_pASCIIFont->setPixelSize(nPixelSize);
-        m_pGeneralFont->setPixelSize(nPixelSize);
+    for (nPointSize = nIniSize - 3; nPointSize <= nIniSize + 3; nPointSize++) {
+        m_pASCIIFont->setPointSize(nPointSize);
+        m_pGeneralFont->setPointSize(nPointSize);
 
         getFontMetrics();
         if ((m_pBuffer->line()*m_nCharHeight) > m_rcClient.height()
                 || (m_pBuffer->columns()*m_nCharWidth) > m_rcClient.width()) {
-            while (nPixelSize > 5) {
-                nPixelSize--;
-                m_pASCIIFont->setPixelSize(nPixelSize);
-                m_pGeneralFont->setPixelSize(nPixelSize);
+            while (nPointSize > 5) {
+                nPointSize--;
+                m_pASCIIFont->setPointSize(nPointSize);
+                m_pGeneralFont->setPointSize(nPointSize);
 
                 getFontMetrics();
                 if ((m_pBuffer->line()*m_nCharHeight) < m_rcClient.height()
@@ -358,8 +358,8 @@
         delete m_pASCIIFont;
     }
     m_pASCIIFont = new QFont(font);
-    m_pASCIIFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
-    m_pGeneralFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
+    m_pASCIIFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
+    m_pGeneralFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
     QResizeEvent* re = new QResizeEvent(size(), size());
     resizeEvent(re);
 }
@@ -370,8 +370,8 @@
         delete m_pGeneralFont;
     }
     m_pGeneralFont = new QFont(font);
-    m_pASCIIFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
-    m_pGeneralFont->setPixelSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
+    m_pASCIIFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
+    m_pGeneralFont->setPointSize(qMax(8,m_pParam->m_mapParam["fontsize"].toInt()));
     m_pMessage->setFont(*m_pGeneralFont);
     QResizeEvent* re = new QResizeEvent(size(), size());
     resizeEvent(re);
@@ -380,8 +380,8 @@
 void Screen::fontSizeChanged(int value)
 {
     m_pParam->m_mapParam["fontsize"] = value;
-    m_pASCIIFont->setPixelSize(qMax(8,value));
-    m_pGeneralFont->setPixelSize(qMax(8,value));
+    m_pASCIIFont->setPointSize(qMax(8,value));
+    m_pGeneralFont->setPointSize(qMax(8,value));
     QResizeEvent* re = new QResizeEvent(size(), size());
     resizeEvent(re);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.