Diffstat (limited to 'noncore/apps/opie-console/emulation_widget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-console/emulation_widget.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/noncore/apps/opie-console/emulation_widget.cpp b/noncore/apps/opie-console/emulation_widget.cpp index 9138f29..d8e342b 100644 --- a/noncore/apps/opie-console/emulation_widget.cpp +++ b/noncore/apps/opie-console/emulation_widget.cpp | |||
@@ -39,12 +39,13 @@ EmulationWidget::EmulationWidget( const Profile& config, QWidget *parent, const | |||
39 | // initialize font attributes | 39 | // initialize font attributes |
40 | QFontMetrics fm( font() ); | 40 | QFontMetrics fm( font() ); |
41 | f_height = fm.height(); | 41 | f_height = fm.height(); |
42 | f_width = fm.maxWidth(); | 42 | f_width = fm.maxWidth(); |
43 | f_ascent = fm.ascent(); | 43 | f_ascent = fm.ascent(); |
44 | 44 | ||
45 | |||
45 | // initialize scrollbar related vars | 46 | // initialize scrollbar related vars |
46 | m_scrollbar = new QScrollBar( this ); | 47 | m_scrollbar = new QScrollBar( this ); |
47 | m_scrollbar->setCursor( arrowCursor ); | 48 | m_scrollbar->setCursor( arrowCursor ); |
48 | 49 | ||
49 | // give reasonable defaults to m_columns, m_lines | 50 | // give reasonable defaults to m_columns, m_lines |
50 | calcGeometry(); | 51 | calcGeometry(); |
@@ -106,12 +107,13 @@ static QChar vt100extended(QChar c) | |||
106 | } | 107 | } |
107 | 108 | ||
108 | 109 | ||
109 | QSize EmulationWidget::calcSize( int cols, int lins ) const | 110 | QSize EmulationWidget::calcSize( int cols, int lins ) const |
110 | { | 111 | { |
111 | int frw = width() - contentsRect().width(); | 112 | int frw = width() - contentsRect().width(); |
113 | |||
112 | int frh = height() - contentsRect().height(); | 114 | int frh = height() - contentsRect().height(); |
113 | int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() ); | 115 | int scw = (scrollLoc == SCRNONE? 0 : m_scrollbar->width() ); |
114 | return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh ); | 116 | return QSize( f_width * cols + 2 * rimX + frw + scw, f_height * lins + 2 * rimY + frh ); |
115 | } | 117 | } |
116 | 118 | ||
117 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) | 119 | void EmulationWidget::setImage( QArray<Character> const newimg, int lines, int columns ) |
@@ -230,12 +232,16 @@ void EmulationWidget::paintEvent( QPaintEvent* pe ) | |||
230 | } | 232 | } |
231 | 233 | ||
232 | void EmulationWidget::calcGeometry() | 234 | void EmulationWidget::calcGeometry() |
233 | { | 235 | { |
234 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); | 236 | m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() ); |
235 | 237 | ||
238 | qDebug( QString(" TEST").arg( contentsRect().width() ) ); | ||
239 | qDebug( QString(" TEST").arg( contentsRect().height() ) ); | ||
240 | qDebug("NEUER TESTT!!!!!!!!"); | ||
241 | |||
236 | switch( scrollLoc ) | 242 | switch( scrollLoc ) |
237 | { | 243 | { |
238 | case SCRNONE : | 244 | case SCRNONE : |
239 | m_columns = ( contentsRect().width() -2 * rimX ) / f_width; | 245 | m_columns = ( contentsRect().width() -2 * rimX ) / f_width; |
240 | m_blX = ( contentsRect().width() - ( m_columns*f_width ) ) / 2; | 246 | m_blX = ( contentsRect().width() - ( m_columns*f_width ) ) / 2; |
241 | m_brX = m_blX; | 247 | m_brX = m_blX; |