Mercurial > octave-dspies

changeset 15678:a1bcffac7fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed cursor position Signed-off-by: Jacob Dawid <jacob.dawid@gmail.com>
author Jen Stewart <jen.stewart.london@gmail.com>
date Sat, 28 Jul 2012 08:43:35 -0400
parents f620ecde2566
children a182972304fa
files libqterminal/unix/TerminalView.cpp libqterminal/unix/TerminalView.h
diffstat 2 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/libqterminal/unix/TerminalView.cpp	Sat Jul 21 01:36:45 2012 -0400
+++ b/libqterminal/unix/TerminalView.cpp	Sat Jul 28 08:43:35 2012 -0400
@@ -134,7 +134,7 @@
    QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals
    come in here as proper unicode characters.
 
-   We treat non-iso10646 fonts as VT100 extended and do the requiered mapping
+   We treat non-iso10646 fonts as VT100 extended and do the required mapping
    from unicode to 0x00..0x1f. The remaining translation is then left to the
    QCodec.
 */
@@ -166,7 +166,7 @@
   // "Base character width on widest ASCII character. This prevents too wide
   //  characters in the presence of double wide (e.g. Japanese) characters."
   // Get the width from representative normal width characters
-  _fontWidth = qRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR));
+  _fontWidth = (double)fm.width(REPCHAR)/(double)strlen(REPCHAR);
 
   _fixedFont = true;
 
@@ -182,7 +182,7 @@
 
 
   if (_fontWidth < 1)
-    _fontWidth=1;
+    _fontWidth = 1;
 
   _fontAscent = fm.ascent();
 
@@ -1191,10 +1191,10 @@
   // int topLeftX = (_contentWidth - _usedColumns * _fontWidth) / 2;
   int topLeftX = 0;
 
-  int leftUpperX = qMin(_usedColumns-1, qMax(0,(rect.left()   - topLeftX - _leftMargin ) / _fontWidth));
-  int leftUpperY = qMin(_usedLines-1,  qMax(0, (rect.top()    - topLeftY - _topMargin  ) / _fontHeight));
-  int rightLowerX = qMin(_usedColumns-1, qMax(0, (rect.right()  - topLeftX - _leftMargin ) / _fontWidth));
-  int rightLowerY = qMin(_usedLines-1,  qMax(0, (rect.bottom() - topLeftY - _topMargin  ) / _fontHeight));
+  int leftUpperX = qMin(_usedColumns-1, qMax(0, qRound((rect.left()   - topLeftX - _leftMargin ) / _fontWidth)));
+  int leftUpperY = qMin(_usedLines-1,  qMax(0, qRound((rect.top()    - topLeftY - _topMargin  ) / _fontHeight)));
+  int rightLowerX = qMin(_usedColumns-1, qMax(0, qRound((rect.right()  - topLeftX - _leftMargin ) / _fontWidth)));
+  int rightLowerY = qMin(_usedLines-1,  qMax(0, qRound((rect.bottom() - topLeftY - _topMargin  ) / _fontHeight)));
 
   const int bufferSize = _usedColumns;
   QChar *disstrU = new QChar[bufferSize];
@@ -2473,11 +2473,11 @@
   if (!_isFixedSize)
     {
       // ensure that display is always at least one column wide
-      _columns = qMax(1,_contentWidth / _fontWidth);
+      _columns = qMax(1,qRound(_contentWidth / _fontWidth));
       _usedColumns = qMin(_usedColumns,_columns);
 
       // ensure that display is always at least one line high
-      _lines = qMax(1,_contentHeight / _fontHeight);
+      _lines = qMax(1, qRound(_contentHeight / _fontHeight));
       _usedLines = qMin(_usedLines,_lines);
     }
 }
--- a/libqterminal/unix/TerminalView.h	Sat Jul 21 01:36:45 2012 -0400
+++ b/libqterminal/unix/TerminalView.h	Sat Jul 28 08:43:35 2012 -0400
@@ -608,8 +608,11 @@
     QGridLayout* _gridLayout;
 
     bool _fixedFont; // has fixed pitch
-    int  _fontHeight;     // height
-    int  _fontWidth;     // width
+
+    double  _fontHeight;     // height
+    double  _fontWidth;     // width
+    //type double to decrease rounding errors
+
     int  _fontAscent;     // ascend
 
     int _leftMargin;    // offset