author | harlekin <harlekin> | 2002-10-23 15:29:20 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-23 15:29:20 (UTC) |
commit | d3c2817cea75b9b84ea02a102e7048abf109f848 (patch) (unidiff) | |
tree | a7ac3e77b5907b7a0e154a8b3bbc770d67459996 | |
parent | 30f9875a844ff59a51c65d542e2ed1c5a214af9d (diff) | |
download | opie-d3c2817cea75b9b84ea02a102e7048abf109f848.zip opie-d3c2817cea75b9b84ea02a102e7048abf109f848.tar.gz opie-d3c2817cea75b9b84ea02a102e7048abf109f848.tar.bz2 |
right widget size when comming back rom fullscreen
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.cpp | 12 | ||||
-rw-r--r-- | noncore/apps/opie-console/function_keyboard.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 7 |
3 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp index 977a384..c314949 100644 --- a/noncore/apps/opie-console/function_keyboard.cpp +++ b/noncore/apps/opie-console/function_keyboard.cpp | |||
@@ -117,3 +117,3 @@ void FunctionKeyboard::paintKey(int row, int col) { | |||
117 | // sometimes it doesnt draw the last line | 117 | // sometimes it doesnt draw the last line |
118 | p.drawLine((col+1) * keyWidth -2, row * keyHeight, | 118 | p.drawLine((col+1) * keyWidth -2, row * keyHeight, |
119 | (col+1) * keyWidth -2, (row + 1) * keyHeight | 119 | (col+1) * keyWidth -2, (row + 1) * keyHeight |
@@ -190,4 +190,4 @@ void FunctionKeyboard::loadDefaults() { | |||
190 | 190 | ||
191 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent) : | 191 | FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na ) |
192 | ProfileDialogKeyWidget(name, parent) { | 192 | : ProfileDialogKeyWidget(name, parent, na) { |
193 | 193 | ||
@@ -228,4 +228,4 @@ FunctionKeyboardConfig::~FunctionKeyboardConfig() { | |||
228 | void FunctionKeyboardConfig::load (const Profile& prof) { | 228 | void FunctionKeyboardConfig::load (const Profile& prof) { |
229 | int i = prof.readNumEntry("keb_rows", 1); | 229 | //int i = prof.readNumEntry("keb_rows", 1); |
230 | //m_rowBox->setValue(i); | 230 | m_rowBox->setValue( 2 ); |
231 | } | 231 | } |
@@ -233,3 +233,3 @@ void FunctionKeyboardConfig::save (Profile& prof) { | |||
233 | 233 | ||
234 | //prof.writeEntry("keb_rows", m_rowBox->value()); | 234 | prof.writeEntry("keb_rows", m_rowBox->value()); |
235 | 235 | ||
diff --git a/noncore/apps/opie-console/function_keyboard.h b/noncore/apps/opie-console/function_keyboard.h index efeff6d..05b991d 100644 --- a/noncore/apps/opie-console/function_keyboard.h +++ b/noncore/apps/opie-console/function_keyboard.h | |||
@@ -65,2 +65,3 @@ private: | |||
65 | uint numRows; | 65 | uint numRows; |
66 | int test; | ||
66 | uint numCols; | 67 | uint numCols; |
@@ -76,5 +77,7 @@ private: | |||
76 | class FunctionKeyboardConfig : public ProfileDialogKeyWidget { | 77 | class FunctionKeyboardConfig : public ProfileDialogKeyWidget { |
78 | |||
77 | Q_OBJECT | 79 | Q_OBJECT |
80 | |||
78 | public: | 81 | public: |
79 | FunctionKeyboardConfig(const QString& name, QWidget *wid); | 82 | FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l ); |
80 | ~FunctionKeyboardConfig(); | 83 | ~FunctionKeyboardConfig(); |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 30dd21c..c1020fa 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -499,7 +499,4 @@ void MainWindow::slotFullscreen() { | |||
499 | if ( m_isFullscreen ) { | 499 | if ( m_isFullscreen ) { |
500 | ( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), false ); | 500 | ( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), true ); |
501 | ( m_curSession->widgetStack() )->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 501 | ( m_curSession->widgetStack() )->resize( savedParentFullscreen->width(), savedParentFullscreen->height() ); |
502 | |||
503 | setCentralWidget( m_consoleWindow ); | ||
504 | ( m_curSession->widgetStack() )->show(); | ||
505 | ( m_curSession->emulationHandler() )->cornerButton()->hide(); | 502 | ( m_curSession->emulationHandler() )->cornerButton()->hide(); |