diff -r 5c1e3c6aa4ef -r b12f3922a74f camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp --- a/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp Fri Jun 11 13:26:48 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiprecaptureview.cpp Wed Jun 23 17:59:54 2010 +0300 @@ -16,7 +16,6 @@ */ #include -#include #include #include #include @@ -169,9 +168,6 @@ if (mMainWindow) { mEngine->viewfinderControl().setWindow(mMainWindow->effectiveWinId()); - setFlag(QGraphicsItem::ItemIsFocusable); - setFocusPolicy(Qt::StrongFocus); - setFocus(); } CX_DEBUG_EXIT_FUNCTION(); @@ -278,25 +274,9 @@ // call load widgets to load app DocML and get the pointers to needed widgets loadWidgets(); } - CxuiView::toggleControls(); } - -// --------------------------------------------------------------------------- -// CxuiPrecaptureView::mousePressEvent -// -// --------------------------------------------------------------------------- -// -void CxuiPrecaptureView::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - //! @todo temporary workaround for title bar mouse event handling bug - if (event->type() == QEvent::GraphicsSceneMousePress && event->scenePos().y() > 70) { - toggleControls(); - event->accept(); - } -} - // --------------------------------------------------------------------------- // CxuiPrecaptureView::handleZoomLevelChange // Slot to handle zoom level change signal from zoom control. @@ -483,15 +463,13 @@ */ void CxuiPrecaptureView::prepareToCloseDialog(HbAction *action) { - if (!action) { - return; - } - // Check if the dialog was started from grid, and show the grid now if needed. // Autofocus key-press will clear the action to disable showing the grid. - QString fromGrid = action->property(PROPERTY_KEY_SETTING_GRID).toString(); - if (fromGrid.compare(QString(PROPERTY_KEY_TRUE)) == 0 ) { - showSettingsGrid(); + if (action) { + QString fromGrid = action->property(PROPERTY_KEY_SETTING_GRID).toString(); + if (fromGrid.compare(QString(PROPERTY_KEY_TRUE)) == 0 ) { + showSettingsGrid(); + } } // Clear the starter actions to be sure they are not reused.