-rw-r--r-- | core/launcher/inputmethods.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp index 765dfe9..09b9a83 100644 --- a/core/launcher/inputmethods.cpp +++ b/core/launcher/inputmethods.cpp | |||
@@ -259,59 +259,63 @@ void InputMethods::chooseKbd() | |||
259 | InputMethod *im = &inputMethodList[i]; | 259 | InputMethod *im = &inputMethodList[i]; |
260 | chooseMethod(im); | 260 | chooseMethod(im); |
261 | } | 261 | } |
262 | 262 | ||
263 | void InputMethods::chooseMethod(InputMethod* im) | 263 | void InputMethods::chooseMethod(InputMethod* im) |
264 | { | 264 | { |
265 | if ( im != method ) { | 265 | if ( im != method ) { |
266 | if ( method && method->widget->isVisible() ) | 266 | if ( method && method->widget->isVisible() ) |
267 | method->widget->hide(); | 267 | method->widget->hide(); |
268 | method = im; | 268 | method = im; |
269 | Config cfg("qpe"); | 269 | Config cfg("qpe"); |
270 | cfg.setGroup("InputMethod"); | 270 | cfg.setGroup("InputMethod"); |
271 | cfg.writeEntry("current", method->interface->name()); | 271 | cfg.writeEntry("current", method->interface->name()); |
272 | kbdButton->setPixmap( *method->interface->icon() ); | 272 | kbdButton->setPixmap( *method->interface->icon() ); |
273 | } | 273 | } |
274 | if ( !kbdButton->isOn() ) | 274 | if ( !kbdButton->isOn() ) |
275 | kbdButton->setOn( TRUE ); | 275 | kbdButton->setOn( TRUE ); |
276 | else | 276 | else |
277 | showKbd( TRUE ); | 277 | showKbd( TRUE ); |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | void InputMethods::showKbd( bool on ) | 281 | void InputMethods::showKbd( bool on ) |
282 | { | 282 | { |
283 | if ( !method ) | 283 | if ( !method ) |
284 | return; | 284 | return; |
285 | 285 | ||
286 | if ( on ) { | 286 | if ( on ) { |
287 | method->interface->resetState(); | 287 | method->interface->resetState(); |
288 | // HACK... Make the texteditor fit with all input methods | 288 | // HACK... Make the texteditor fit with all input methods |
289 | // Input methods should also never use more than about 40% of the screen | 289 | // Input methods should also never use more than about 40% of the screen |
290 | int height = QMIN( method->widget->sizeHint().height(), 134 ); | 290 | int height = QMIN( method->widget->sizeHint().height(), 134 ); |
291 | #ifdef QT_QWS_SIMPAD | ||
292 | method->widget->resize( qApp->desktop()->width() / 2, height ); // make it half the width on the SIMpad | ||
293 | #else | ||
291 | method->widget->resize( qApp->desktop()->width(), height ); | 294 | method->widget->resize( qApp->desktop()->width(), height ); |
295 | #endif | ||
292 | method->widget->move( 0, mapToGlobal( QPoint() ).y() - height ); | 296 | method->widget->move( 0, mapToGlobal( QPoint() ).y() - height ); |
293 | method->widget->show(); | 297 | method->widget->show(); |
294 | } else { | 298 | } else { |
295 | method->widget->hide(); | 299 | method->widget->hide(); |
296 | } | 300 | } |
297 | 301 | ||
298 | emit inputToggled( on ); | 302 | emit inputToggled( on ); |
299 | } | 303 | } |
300 | 304 | ||
301 | bool InputMethods::shown() const | 305 | bool InputMethods::shown() const |
302 | { | 306 | { |
303 | return method && method->widget->isVisible(); | 307 | return method && method->widget->isVisible(); |
304 | } | 308 | } |
305 | 309 | ||
306 | QString InputMethods::currentShown() const | 310 | QString InputMethods::currentShown() const |
307 | { | 311 | { |
308 | return method && method->widget->isVisible() | 312 | return method && method->widget->isVisible() |
309 | ? method->interface->name() : QString::null; | 313 | ? method->interface->name() : QString::null; |
310 | } | 314 | } |
311 | 315 | ||
312 | void InputMethods::sendKey( ushort unicode, ushort scancode, ushort mod, bool press, bool repeat ) | 316 | void InputMethods::sendKey( ushort unicode, ushort scancode, ushort mod, bool press, bool repeat ) |
313 | { | 317 | { |
314 | #if defined(Q_WS_QWS) | 318 | #if defined(Q_WS_QWS) |
315 | QWSServer::sendKeyEvent( unicode, scancode, mod, press, repeat ); | 319 | QWSServer::sendKeyEvent( unicode, scancode, mod, press, repeat ); |
316 | #endif | 320 | #endif |
317 | } | 321 | } |