-rw-r--r-- | core/launcher/taskbar.cpp | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp index 37fdb30..2966168 100644 --- a/core/launcher/taskbar.cpp +++ b/core/launcher/taskbar.cpp | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "taskbar.h" | 28 | #include "taskbar.h" |
29 | #include "server.h" | 29 | #include "server.h" |
30 | 30 | ||
31 | #include <qtopia/config.h> | ||
31 | #include <qtopia/qpeapplication.h> | 32 | #include <qtopia/qpeapplication.h> |
32 | #ifdef QWS | 33 | #ifdef QWS |
33 | #include <qtopia/qcopenvelope_qws.h> | 34 | #include <qtopia/qcopenvelope_qws.h> |
@@ -172,6 +173,10 @@ TaskBar::~TaskBar() | |||
172 | 173 | ||
173 | TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader) | 174 | TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOnTop | WGroupLeader) |
174 | { | 175 | { |
176 | Config cfg( "Launcher" ); | ||
177 | cfg.setGroup( "InputMethods" ); | ||
178 | resizeRunningApp = cfg.readBoolEntry( "Resize", true ); | ||
179 | |||
175 | sm = new StartMenu( this ); | 180 | sm = new StartMenu( this ); |
176 | connect( sm, SIGNAL(tabSelected(const QString&)), this, | 181 | connect( sm, SIGNAL(tabSelected(const QString&)), this, |
177 | SIGNAL(tabSelected(const QString&)) ); | 182 | SIGNAL(tabSelected(const QString&)) ); |
@@ -291,26 +296,24 @@ void TaskBar::styleChange( QStyle &s ) | |||
291 | 296 | ||
292 | void TaskBar::calcMaxWindowRect() | 297 | void TaskBar::calcMaxWindowRect() |
293 | { | 298 | { |
294 | /* | 299 | if ( resizeRunningApp ) |
295 | #ifdef Q_WS_QWS | 300 | { |
296 | QRect wr; | 301 | #if defined(Q_WS_QWS) |
297 | int displayWidth = qApp->desktop()->width(); | 302 | QRect wr; |
298 | QRect ir = inputMethods->inputRect(); | 303 | int displayWidth = qApp->desktop()->width(); |
299 | if ( ir.isValid() ) { | 304 | QRect ir = inputMethods->inputRect(); |
300 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); | 305 | if ( ir.isValid() ) { |
301 | } else { | 306 | wr.setCoords( 0, 0, displayWidth-1, ir.top()-1 ); |
302 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); | 307 | } else { |
308 | wr.setCoords( 0, 0, displayWidth-1, y()-1 ); | ||
309 | } | ||
310 | #if QT_VERSION < 0x030000 | ||
311 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr,QSize(qt_screen->width(),qt_screen->height())) ); | ||
312 | #else | ||
313 | QWSServer::setMaxWindowRect( wr ); | ||
314 | #endif | ||
315 | #endif | ||
303 | } | 316 | } |
304 | |||
305 | #if QT_VERSION < 0x030000 | ||
306 | QWSServer::setMaxWindowRect( qt_screen->mapToDevice(wr, | ||
307 | QSize(qt_screen->width(),qt_screen->height())) | ||
308 | ); | ||
309 | #else | ||
310 | QWSServer::setMaxWindowRect( wr ); | ||
311 | #endif | ||
312 | #endif | ||
313 | */ | ||
314 | } | 317 | } |
315 | 318 | ||
316 | void TaskBar::receive( const QCString &msg, const QByteArray &data ) | 319 | void TaskBar::receive( const QCString &msg, const QByteArray &data ) |