From e688f02fa2d750eca01c92435d8793ba17aa050a Mon Sep 17 00:00:00 2001 From: sandman Date: Thu, 17 Oct 2002 23:44:48 +0000 Subject: Fix for bug #300: forgot to copy the launcher setMaxWindowRect() code --- 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 @@ -74,7 +74,6 @@ helvetica 18 1 - 1 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 @@ -37,6 +37,10 @@ #include #include #include +#if QT_VERSION < 300 +#include +#endif +#include #include #include @@ -61,8 +65,12 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( ))); 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 ); @@ -87,12 +95,47 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C if ( !last. isEmpty ( )) m_user-> setEditText ( last ); + + calcMaxWindowRect ( ); } 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 ) { switch ( e-> key ( )) { 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 @@ -47,6 +47,8 @@ protected slots: void backlight ( ); void login ( ); void toggleEchoMode ( bool ); + void calcMaxWindowRect ( ); + void receive ( const QCString &, const QByteArray & ); protected: virtual void keyPressEvent ( QKeyEvent *e ); -- cgit v0.9.0.2