- reduce number of lines correctly (fixes problems with small fonts)

- when using fullscreen, move corner widget into lower right corner :)

1 files changed, 6 insertions, 2 deletions

diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index 2db214c..d1ff85e 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -1153,16 +1153,20 @@ void TEWidget::calcGeometry()
   int hwidth = 0;
 
   if(vcolumns == 0) showhscrollbar = 0;
   if(showhscrollbar == 1) hwidth = QApplication::style().scrollBarExtent().width();
 
   scrollbar->resize(QApplication::style().scrollBarExtent().width(),
                     contentsRect().height() - hwidth);
 
+  if(!showhscrollbar) cornerButton()->move(0, 0);
+  else cornerButton()->move(contentsRect().width() - hwidth, contentsRect().height() - hwidth);
+
+
   if(showhscrollbar == 1)
   {
     hscrollbar->resize(contentsRect().width() - hwidth, hwidth);
     hscrollbar->setRange(0, 40);
 
     QPoint p = contentsRect().bottomLeft();
     hscrollbar->move(QPoint(p.x(), p.y() - hwidth));
     hscrollbar->show();
@@ -1202,18 +1206,18 @@ void TEWidget::calcGeometry()
      break;
   }
   //FIXME: support 'rounding' styles
   lines   = ( contentsRect().height() - 2 * rimY  ) / font_h;
   bY = (contentsRect().height() - (lines  *font_h)) / 2;
 
   if(showhscrollbar == 1)
   {
-    //bY = bY - 10;
-    lines = lines - 1;
+    lines = lines - (hwidth / font_h) - 1;
+	if(lines < 1) lines = 1;
   }
 }
 
 void TEWidget::makeImage()
 //FIXME: rename 'calcGeometry?
 {
   calcGeometry();
   image = (ca*) malloc(lines*columns*sizeof(ca));