| author | ibotty <ibotty> | 2002-10-14 08:54:34 (UTC) |
|---|---|---|
| committer | ibotty <ibotty> | 2002-10-14 08:54:34 (UTC) |
| commit | 59d6018e53537e15d27cd0174adefba2ec8b8f6e (patch) (side-by-side diff) | |
| tree | 5f55e9c314b7918b1abf92d2a98561039a499084 /noncore | |
| parent | 2c2d282f3d665035300873bddab6e64c843ebc0e (diff) | |
| download | opie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.zip opie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.tar.gz opie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.tar.bz2 | |
added sizeHint method, hopefully (dont really think so) fixes size problem
VS: ----------------------------------------------------------------------
| -rw-r--r-- | noncore/apps/opie-console/emulation_widget.cpp | 9 | ||||
| -rw-r--r-- | noncore/apps/opie-console/emulation_widget.h | 2 | ||||
| -rw-r--r-- | noncore/apps/opie-console/widget_layer.cpp | 6 | ||||
| -rw-r--r-- | noncore/apps/opie-console/widget_layer.h | 5 |
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 @@ -90,6 +90,13 @@ static QChar vt100extended(QChar 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 ) { @@ -117,7 +124,7 @@ 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 ) { 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 @@ -60,6 +60,8 @@ public: */ virtual void scroll( int value ); + virtual QSize calcSize( int cols, int lins ) const; + protected: /** 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 @@ -53,6 +53,12 @@ WidgetLayer::~WidgetLayer() } +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 @@ -123,6 +123,11 @@ public: virtual bool eventFilter( QObject *obj, QEvent *event ); + + + QSize sizeHint(); + + virtual QSize calcSize( int cols, int lins ) const = 0; signals: /** |