equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
7 ** This file is part of the QtGui module of the Qt Toolkit. |
8 ** |
8 ** |
209 |
209 |
210 #ifdef Q_WS_S60 |
210 #ifdef Q_WS_S60 |
211 void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &softkeys) |
211 void QSoftKeyManagerPrivate::updateSoftKeys_sys(const QList<QAction*> &softkeys) |
212 { |
212 { |
213 // lets not update softkeys if s60 native dialog or menu is shown |
213 // lets not update softkeys if s60 native dialog or menu is shown |
214 if (CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog()) |
214 if (QApplication::testAttribute(Qt::AA_S60DontConstructApplicationPanes) |
|
215 || CCoeEnv::Static()->AppUi()->IsDisplayingMenuOrDialog()) |
215 return; |
216 return; |
216 |
217 |
217 CEikButtonGroupContainer* nativeContainer = S60->buttonGroupContainer(); |
218 CEikButtonGroupContainer* nativeContainer = S60->buttonGroupContainer(); |
218 nativeContainer->DrawableWindow()->SetOrdinalPosition(0); |
219 nativeContainer->DrawableWindow()->SetOrdinalPosition(0); |
219 nativeContainer->DrawableWindow()->SetPointerCapturePriority(1); //keep softkeys available in modal dialog |
220 nativeContainer->DrawableWindow()->SetPointerCapturePriority(1); //keep softkeys available in modal dialog |