- 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
@@ -1157,8 +1157,12 @@ void TEWidget::calcGeometry()
 
   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);
@@ -1206,10 +1210,10 @@ void TEWidget::calcGeometry()
   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()