| author | sandman <sandman> | 2002-10-17 23:44:48 (UTC) |
|---|---|---|
| committer | sandman <sandman> | 2002-10-17 23:44:48 (UTC) |
| commit | e688f02fa2d750eca01c92435d8793ba17aa050a (patch) (side-by-side diff) | |
| tree | cd8e80653ae4828bb763ea4a2c40cbcc784b573b | |
| parent | 6a4685320a318f99a2f60c9b4e4f461f803c3f56 (diff) | |
| download | opie-e688f02fa2d750eca01c92435d8793ba17aa050a.zip opie-e688f02fa2d750eca01c92435d8793ba17aa050a.tar.gz opie-e688f02fa2d750eca01c92435d8793ba17aa050a.tar.bz2 | |
Fix for bug #300: forgot to copy the launcher setMaxWindowRect() code
| -rw-r--r-- | core/opie-login/loginwindow.ui | 1 | ||||
| -rw-r--r-- | core/opie-login/loginwindowimpl.cpp | 43 | ||||
| -rw-r--r-- | core/opie-login/loginwindowimpl.h | 2 |
3 files changed, 45 insertions, 1 deletions
diff --git a/core/opie-login/loginwindow.ui b/core/opie-login/loginwindow.ui index 5a35c8d..245e942 100644 --- a/core/opie-login/loginwindow.ui +++ b/core/opie-login/loginwindow.ui @@ -75,5 +75,4 @@ <pointsize>18</pointsize> <bold>1</bold> - <underline>1</underline> </font> </property> diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp index fe2906a..577cb41 100644 --- a/core/opie-login/loginwindowimpl.cpp +++ b/core/opie-login/loginwindowimpl.cpp @@ -38,4 +38,8 @@ #include <qmessagebox.h> #include <qimage.h> +#if QT_VERSION < 300 +#include <qgfx_qws.h> +#endif +#include <qwindowsystem_qws.h> #include <qpe/resource.h> @@ -62,6 +66,10 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C m_menu-> setPopup ( pop ); + QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this ); + connect ( channel, SIGNAL( received ( const QCString &, const QByteArray & )), this, SLOT( receive ( const QCString &, const QByteArray & ))); + QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 ); m_input = new InputMethods ( m_taskbar ); + connect ( m_input, SIGNAL( inputToggled ( bool )), this, SLOT( calcMaxWindowRect ( ))); lay-> addWidget ( m_input ); lay-> addStretch ( 10 ); @@ -88,4 +96,6 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C if ( !last. isEmpty ( )) m_user-> setEditText ( last ); + + calcMaxWindowRect ( ); } @@ -94,4 +104,37 @@ LoginWindowImpl::~LoginWindowImpl ( ) } + +void LoginWindowImpl::receive ( const QCString &msg, const QByteArray &data ) +{ + QDataStream stream ( data, IO_ReadOnly ); + + if ( msg == "hideInputMethod()" ) + m_input-> hideInputMethod ( ); + else if ( msg == "showInputMethod()" ) + m_input-> showInputMethod ( ); + else if ( msg == "reloadInputMethods()" ) + m_input-> loadInputMethods ( ); +} + +void LoginWindowImpl::calcMaxWindowRect ( ) +{ +#ifdef Q_WS_QWS + QRect wr; + int displayWidth = qApp-> desktop ( )-> width ( ); + QRect ir = m_input-> inputRect ( ); + if ( ir.isValid() ) + wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); + else + wr.setCoords( 0, 0, displayWidth-1, m_taskbar->y()-1 ); + +#if QT_VERSION < 300 + wr = qt_screen-> mapToDevice ( wr, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); +#endif + + QWSServer::setMaxWindowRect( wr ); +#endif +} + + void LoginWindowImpl::keyPressEvent ( QKeyEvent *e ) { diff --git a/core/opie-login/loginwindowimpl.h b/core/opie-login/loginwindowimpl.h index e769b03..df8dbbb 100644 --- a/core/opie-login/loginwindowimpl.h +++ b/core/opie-login/loginwindowimpl.h @@ -48,4 +48,6 @@ protected slots: void login ( ); void toggleEchoMode ( bool ); + void calcMaxWindowRect ( ); + void receive ( const QCString &, const QByteArray & ); protected: |