added sizeHint method, hopefully (dont really think so) fixes size problem

VS: ----------------------------------------------------------------------

4 files changed, 21 insertions, 1 deletions

diff --git a/noncore/apps/opie-console/emulation_widget.cpp b/noncore/apps/opie-console/emulation_widget.cpp
index e11c5e4..40199fa 100644
--- a/noncore/apps/opie-console/emulation_widget.cpp
+++ b/noncore/apps/opie-console/emulation_widget.cpp
@@ -89,8 +89,15 @@ static QChar vt100extended(QChar c)
   return c;
 }
 
 
+QSize EmulationWidget::calcSize( int cols, int lins ) const
+{
+    int frw = width() - contentsRect().width();
+    int frh = height() - contentsRect().height();
+    int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() );
+    return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh );
+}
 
 void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns )
 {
 	const QPixmap* pm = backgroundPixmap();
@@ -116,9 +123,9 @@ void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int c
 
 	for ( int y = 0; y < lins; ++y )
 	{	int len;
 		const Character* lcl = &m_image[y * m_columns];
-		const Character* ext = &newimg[y * columns];
+		const Character* ext = &newimg[y * m_columns];
 		if ( ! m_resizing )
 		for ( int x = 0; x < cols; ++x )
 		{
 			// disable, till widget works, WITHOUT blinking
diff --git a/noncore/apps/opie-console/emulation_widget.h b/noncore/apps/opie-console/emulation_widget.h
index e185534..5e20dc4 100644
--- a/noncore/apps/opie-console/emulation_widget.h
+++ b/noncore/apps/opie-console/emulation_widget.h
@@ -59,8 +59,10 @@ public:
      * @param int value, scroll by this value
      */
     virtual void scroll( int value );
 
+    virtual QSize calcSize( int cols, int lins ) const;
+
 protected:
 
     /**
      * calculates current image bounds
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp
index e4b0ede..ac84f8b 100644
--- a/noncore/apps/opie-console/widget_layer.cpp
+++ b/noncore/apps/opie-console/widget_layer.cpp
@@ -52,8 +52,14 @@ WidgetLayer::~WidgetLayer()
 	delete m_image;
 }
 
 
+QSize WidgetLayer::sizeHint()
+{
+    return size();
+}
+
+
 /* --------------------------------- audio ---------------------------------- */
 
 void WidgetLayer::bell()
 {
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h
index 0c290f3..6812711 100644
--- a/noncore/apps/opie-console/widget_layer.h
+++ b/noncore/apps/opie-console/widget_layer.h
@@ -122,8 +122,13 @@ public:
 	virtual void scroll( int value ) = 0;
 
 
 	virtual bool eventFilter( QObject *obj, QEvent *event );
+
+
+	QSize sizeHint();
+
+	virtual QSize calcSize( int cols, int lins ) const = 0;
 signals:
 
 	/**
 	 * key was pressed