summaryrefslogtreecommitdiff
authoribotty <ibotty>2002-10-14 08:54:34 (UTC)
committer ibotty <ibotty>2002-10-14 08:54:34 (UTC)
commit59d6018e53537e15d27cd0174adefba2ec8b8f6e (patch) (unidiff)
tree5f55e9c314b7918b1abf92d2a98561039a499084
parent2c2d282f3d665035300873bddab6e64c843ebc0e (diff)
downloadopie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.zip
opie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.tar.gz
opie-59d6018e53537e15d27cd0174adefba2ec8b8f6e.tar.bz2
added sizeHint method, hopefully (dont really think so) fixes size problem
VS: ----------------------------------------------------------------------
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/emulation_widget.cpp9
-rw-r--r--noncore/apps/opie-console/emulation_widget.h2
-rw-r--r--noncore/apps/opie-console/widget_layer.cpp6
-rw-r--r--noncore/apps/opie-console/widget_layer.h5
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)
90} 90}
91 91
92 92
93QSize EmulationWidget::calcSize( int cols, int lins ) const
94{
95 int frw = width() - contentsRect().width();
96 int frh = height() - contentsRect().height();
97 int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() );
98 return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh );
99}
93 100
94void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) 101void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns )
95{ 102{
@@ -117,7 +124,7 @@ void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int c
117 for ( int y = 0; y < lins; ++y ) 124 for ( int y = 0; y < lins; ++y )
118 {int len; 125 {int len;
119 const Character* lcl = &m_image[y * m_columns]; 126 const Character* lcl = &m_image[y * m_columns];
120 const Character* ext = &newimg[y * columns]; 127 const Character* ext = &newimg[y * m_columns];
121 if ( ! m_resizing ) 128 if ( ! m_resizing )
122 for ( int x = 0; x < cols; ++x ) 129 for ( int x = 0; x < cols; ++x )
123 { 130 {
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:
60 */ 60 */
61 virtual void scroll( int value ); 61 virtual void scroll( int value );
62 62
63 virtual QSize calcSize( int cols, int lins ) const;
64
63protected: 65protected:
64 66
65 /** 67 /**
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()
53} 53}
54 54
55 55
56QSize WidgetLayer::sizeHint()
57{
58 return size();
59}
60
61
56/* --------------------------------- audio ---------------------------------- */ 62/* --------------------------------- audio ---------------------------------- */
57 63
58void WidgetLayer::bell() 64void 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:
123 123
124 124
125 virtual bool eventFilter( QObject *obj, QEvent *event ); 125 virtual bool eventFilter( QObject *obj, QEvent *event );
126
127
128 QSize sizeHint();
129
130 virtual QSize calcSize( int cols, int lins ) const = 0;
126signals: 131signals:
127 132
128 /** 133 /**