author | harlekin <harlekin> | 2002-10-18 11:56:52 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-18 11:56:52 (UTC) |
commit | d810fe01a5b7356c65c034bfc808688c399dfd81 (patch) (unidiff) | |
tree | 7ad05dbf5dd830752f702ae29ab79ca3d1248669 /noncore | |
parent | 24c0ae04669e94d554fe8ef49888ffb5a6a00656 (diff) | |
download | opie-d810fe01a5b7356c65c034bfc808688c399dfd81.zip opie-d810fe01a5b7356c65c034bfc808688c399dfd81.tar.gz opie-d810fe01a5b7356c65c034bfc808688c399dfd81.tar.bz2 |
back from fullscreen now right reparented
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 55e9836..27407d9 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -1,7 +1,5 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | 2 | ||
3 | |||
4 | |||
5 | #include <qaction.h> | 3 | #include <qaction.h> |
6 | #include <qmenubar.h> | 4 | #include <qmenubar.h> |
7 | #include <qlabel.h> | 5 | #include <qlabel.h> |
@@ -12,8 +10,8 @@ | |||
12 | #include <qwhatsthis.h> | 10 | #include <qwhatsthis.h> |
13 | 11 | ||
14 | #include <qpe/resource.h> | 12 | #include <qpe/resource.h> |
15 | #include <opie/ofiledialog.h> | ||
16 | 13 | ||
14 | #include <opie/ofiledialog.h> | ||
17 | 15 | ||
18 | #include "keytrans.h" | 16 | #include "keytrans.h" |
19 | #include "profileeditordialog.h" | 17 | #include "profileeditordialog.h" |
@@ -486,17 +484,21 @@ void MainWindow::slotSessionChanged( Session* ses ) { | |||
486 | 484 | ||
487 | void MainWindow::slotFullscreen() { | 485 | void MainWindow::slotFullscreen() { |
488 | 486 | ||
487 | |||
488 | |||
489 | if ( m_isFullscreen ) { | 489 | if ( m_isFullscreen ) { |
490 | ( m_curSession->widgetStack() )->reparent( m_consoleWindow, 0, QPoint(0,0), false ); | 490 | ( m_curSession->widgetStack() )->reparent( savedParentFullscreen, 0, QPoint(0,0), false ); |
491 | ( m_curSession->widgetStack() )->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 491 | ( m_curSession->widgetStack() )->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
492 | |||
492 | setCentralWidget( m_consoleWindow ); | 493 | setCentralWidget( m_consoleWindow ); |
493 | ( m_curSession->widgetStack() )->show(); | 494 | ( m_curSession->widgetStack() )->show(); |
494 | ( m_curSession->emulationHandler() )->cornerButton()->hide(); | 495 | ( m_curSession->emulationHandler() )->cornerButton()->hide(); |
495 | disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) ); | 496 | disconnect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) ); |
496 | 497 | ||
497 | } else { | 498 | } else { |
499 | savedParentFullscreen = ( m_curSession->widgetStack() )->parentWidget(); | ||
498 | ( m_curSession->widgetStack() )->setFrameStyle( QFrame::NoFrame ); | 500 | ( m_curSession->widgetStack() )->setFrameStyle( QFrame::NoFrame ); |
499 | ( m_curSession->widgetStack() )->reparent( 0,WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop | 501 | ( m_curSession->widgetStack() )->reparent( 0, WStyle_Tool | WStyle_Customize | WStyle_StaysOnTop |
500 | , QPoint(0,0), false ); | 502 | , QPoint(0,0), false ); |
501 | ( m_curSession->widgetStack() )->resize( qApp->desktop()->width(), qApp->desktop()->height() ); | 503 | ( m_curSession->widgetStack() )->resize( qApp->desktop()->width(), qApp->desktop()->height() ); |
502 | ( m_curSession->widgetStack() )->setFocus(); | 504 | ( m_curSession->widgetStack() )->setFocus(); |