equal
deleted
inserted
replaced
297 if( aEvent.Type() == EEventPointer ) |
297 if( aEvent.Type() == EEventPointer ) |
298 { |
298 { |
299 // Touch outside of volume popup, close volume popup |
299 // Touch outside of volume popup, close volume popup |
300 if ( aEvent.Pointer()->iType == TPointerEvent::EButton1Down ) |
300 if ( aEvent.Pointer()->iType == TPointerEvent::EButton1Down ) |
301 { |
301 { |
302 if ( aDestination == this ) |
302 if ( iAppUi.IsDisplayingMenuOrDialog() ) |
|
303 { |
|
304 iOkToSwapOnButtonUp = EFalse; |
|
305 } |
|
306 else if ( aDestination == this ) |
303 { |
307 { |
304 iOkToSwapOnButtonUp = !iUiStates.IsZoomModeOn() && |
308 iOkToSwapOnButtonUp = !iUiStates.IsZoomModeOn() && |
305 !iUiStates.IsCaptureModeOn() && |
309 !iUiStates.IsCaptureModeOn() && |
306 !iUiStates.IsContrastModeOn() && |
310 !iUiStates.IsContrastModeOn() && |
307 !iUiStates.IsBrightnessModeOn() && |
311 !iUiStates.IsBrightnessModeOn() && |