equal
deleted
inserted
replaced
481 (iFocusedComponent < iCustomComponents.Count()) && |
481 (iFocusedComponent < iCustomComponents.Count()) && |
482 (iCustomComponents[iFocusedComponent]-> |
482 (iCustomComponents[iFocusedComponent]-> |
483 CustomComponentControl(KComponentMainControl)->IsVisible())) |
483 CustomComponentControl(KComponentMainControl)->IsVisible())) |
484 { |
484 { |
485 // Traversal check |
485 // Traversal check |
486 if ((aType == EEventKeyDown) && |
486 if ((aType == EEventKey) && |
487 (((aEvent.iCode == EKeyUpArrow) || |
487 (((aEvent.iCode == EKeyUpArrow) || |
488 (aEvent.iCode == EKeyDownArrow)) || |
488 (aEvent.iCode == EKeyDownArrow)) || |
489 ((aEvent.iScanCode == EStdKeyUpArrow) || |
489 ((aEvent.iScanCode == EStdKeyUpArrow) || |
490 (aEvent.iScanCode == EStdKeyDownArrow)))) |
490 (aEvent.iScanCode == EStdKeyDownArrow)))) |
491 { |
491 { |
2456 { |
2456 { |
2457 iPointerEventSuppressionOngoing = EFalse; |
2457 iPointerEventSuppressionOngoing = EFalse; |
2458 } |
2458 } |
2459 |
2459 |
2460 // To have the cursor on focused control |
2460 // To have the cursor on focused control |
2461 if (iFocusedComponent != KComponentFocusedNone) |
2461 if ((iFocusedComponent != KComponentFocusedNone) && |
|
2462 (iFocusedComponent < iCustomComponents.Count()) && |
|
2463 iCustomComponents[iFocusedComponent]-> |
|
2464 CustomComponentControl(KComponentMainControl)->IsVisible()) |
2462 { |
2465 { |
2463 iCustomComponents[iFocusedComponent]-> |
2466 iCustomComponents[iFocusedComponent]-> |
2464 CustomComponentControl(KComponentMainControl)-> |
2467 CustomComponentControl(KComponentMainControl)-> |
2465 SetFocus(ETrue); |
2468 SetFocus(ETrue); |
2466 } |
2469 } |
2654 |
2657 |
2655 HandleSizeChanged(landscape != iLandscape); |
2658 HandleSizeChanged(landscape != iLandscape); |
2656 iLandscape = landscape; |
2659 iLandscape = landscape; |
2657 |
2660 |
2658 PostEvent(ESizeChanged, iContentSize.iWidth, iContentSize.iHeight); |
2661 PostEvent(ESizeChanged, iContentSize.iWidth, iContentSize.iHeight); |
2659 |
|
2660 if (IsWindowVisible() && iWndUpdate) |
2662 if (IsWindowVisible() && iWndUpdate) |
2661 { |
2663 { |
2662 // Post forced paint to enable Canvas repaint behind |
2664 // Post forced paint to enable Canvas repaint behind |
2663 // Alert or Pop-up TextBox |
2665 // Alert or Pop-up TextBox |
2664 PostForcedPaint(); |
2666 PostForcedPaint(); |
2665 } |
2667 } |
|
2668 |
2666 #else |
2669 #else |
2667 iContentSize = contentSize; |
2670 iContentSize = contentSize; |
2668 PostEvent(ESizeChanged, iContentSize.iWidth, iContentSize.iHeight); |
2671 PostEvent(ESizeChanged, iContentSize.iWidth, iContentSize.iHeight); |
2669 #endif // RD_JAVA_NGA_ENABLED |
2672 #endif // RD_JAVA_NGA_ENABLED |
2670 } |
2673 } |
2686 } |
2689 } |
2687 |
2690 |
2688 // We cannot determine whether the control size actually did change or |
2691 // We cannot determine whether the control size actually did change or |
2689 // not, so we have to do the layout no matter what. |
2692 // not, so we have to do the layout no matter what. |
2690 Layout(); |
2693 Layout(); |
|
2694 #ifdef RD_JAVA_NGA_ENABLED |
|
2695 if (IsWindowVisible() && iWndUpdate) |
|
2696 { |
|
2697 // Post forced paint to enable Canvas repaint behind |
|
2698 // Alert or Pop-up TextBox |
|
2699 PostForcedPaint(); |
|
2700 } |
|
2701 #endif // RD_JAVA_NGA_ENABLED |
2691 } |
2702 } |
2692 DEBUG("- CMIDCanvas::SizeChanged"); |
2703 DEBUG("- CMIDCanvas::SizeChanged"); |
2693 } |
2704 } |
2694 |
2705 |
2695 |
2706 |