author | ibotty <ibotty> | 2002-10-14 08:54:34 (UTC) |
---|---|---|
committer | ibotty <ibotty> | 2002-10-14 08:54:34 (UTC) |
commit | 59d6018e53537e15d27cd0174adefba2ec8b8f6e (patch) (unidiff) | |
tree | 5f55e9c314b7918b1abf92d2a98561039a499084 | |
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 | |||
@@ -87,12 +87,19 @@ static QChar vt100extended(QChar c) | |||
87 | case 0x00b7 : return 31; | 87 | case 0x00b7 : return 31; |
88 | } | 88 | } |
89 | return c; | 89 | return c; |
90 | } | 90 | } |
91 | 91 | ||
92 | 92 | ||
93 | QSize 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 | ||
94 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) | 101 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) |
95 | { | 102 | { |
96 | const QPixmap* pm = backgroundPixmap(); | 103 | const QPixmap* pm = backgroundPixmap(); |
97 | QPainter paint; | 104 | QPainter paint; |
98 | 105 | ||
@@ -114,13 +121,13 @@ void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int c | |||
114 | int cols = QMIN( m_columns, QMAX( 0, columns ) ); | 121 | int cols = QMIN( m_columns, QMAX( 0, columns ) ); |
115 | QArray<QChar> disstrU = QArray<QChar>( cols ); | 122 | QArray<QChar> disstrU = QArray<QChar>( cols ); |
116 | 123 | ||
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 | { |
124 | // disable, till widget works, WITHOUT blinking | 131 | // disable, till widget works, WITHOUT blinking |
125 | //hasBlinker |= ( ext[x].r & RE_BLINK ); | 132 | //hasBlinker |= ( ext[x].r & RE_BLINK ); |
126 | 133 | ||
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 | |||
@@ -57,12 +57,14 @@ public: | |||
57 | /** | 57 | /** |
58 | * scrolls (not yet implemented) | 58 | * scrolls (not yet implemented) |
59 | * @param int value, scroll by this value | 59 | * @param int value, scroll by this value |
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 | |||
63 | protected: | 65 | protected: |
64 | 66 | ||
65 | /** | 67 | /** |
66 | * calculates current image bounds | 68 | * calculates current image bounds |
67 | */ | 69 | */ |
68 | virtual void calcGeometry(); | 70 | virtual void calcGeometry(); |
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 | |||
@@ -50,12 +50,18 @@ WidgetLayer::~WidgetLayer() | |||
50 | { | 50 | { |
51 | // clean up | 51 | // clean up |
52 | delete m_image; | 52 | delete m_image; |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | QSize WidgetLayer::sizeHint() | ||
57 | { | ||
58 | return size(); | ||
59 | } | ||
60 | |||
61 | |||
56 | /* --------------------------------- audio ---------------------------------- */ | 62 | /* --------------------------------- audio ---------------------------------- */ |
57 | 63 | ||
58 | void WidgetLayer::bell() | 64 | void WidgetLayer::bell() |
59 | { | 65 | { |
60 | QApplication::beep(); | 66 | QApplication::beep(); |
61 | } | 67 | } |
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 | |||
@@ -120,12 +120,17 @@ public: | |||
120 | * @param int value, how much the widget should scroll up (positive value) or down (negative value) | 120 | * @param int value, how much the widget should scroll up (positive value) or down (negative value) |
121 | */ | 121 | */ |
122 | virtual void scroll( int value ) = 0; | 122 | virtual void scroll( int value ) = 0; |
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; | ||
126 | signals: | 131 | signals: |
127 | 132 | ||
128 | /** | 133 | /** |
129 | * key was pressed | 134 | * key was pressed |
130 | */ | 135 | */ |
131 | void keyPressed( QKeyEvent *e ); | 136 | void keyPressed( QKeyEvent *e ); |