From df299de9748adb2cdb21834956907076971ff45d Mon Sep 17 00:00:00 2001 From: Markku Luukkainen Date: Tue, 16 Jun 2009 09:44:07 +0200 Subject: Bugfix. Softkeys were set to wrong widget when combobox was focused. --- examples/widgets/softkeys/softkeys.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/examples/widgets/softkeys/softkeys.cpp b/examples/widgets/softkeys/softkeys.cpp index 9672aee..e717510 100644 --- a/examples/widgets/softkeys/softkeys.cpp +++ b/examples/widgets/softkeys/softkeys.cpp @@ -127,7 +127,9 @@ void MainWindow::addSoftKeys() QList softkeys; softkeys.append(ok); softkeys.append(cancel); - pushButton->setSoftKeys(softkeys); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKeys(softkeys); } void MainWindow::exitApplication() @@ -138,13 +140,17 @@ void MainWindow::exitApplication() void MainWindow::okPressed() { infoLabel->setText(tr("OK pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } void MainWindow::cancelPressed() { infoLabel->setText(tr("Cancel pressed")); - pushButton->setSoftKey(0); + QWidget* focusWidget = QApplication::focusWidget(); + if (focusWidget) + focusWidget->setSoftKey(0); } -- cgit v0.12