FCL/sf/app/jrt: comparison javauis/lcdui_akn/lcdui/src/CMIDTextBoxQueryDialog.cpp

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 }
 void CMIDTextBoxQueryDialog::FocusChanged(TDrawNow aDrawNow)
 {
 CAknTextQueryDialog::FocusChanged(aDrawNow);
-TRAP_IGNORE(UpdateScrollBarPositionL());
 }
 //
 // We do not want to become visible if we are not showing
 //
 void CMIDTextBoxQueryDialog::MakeVisible(TBool aVisible)
 if (Size() < iMaxSize)
 {
 SetCursorPositionL(cursorPos + 1);
 }
-else if (cursorPos == (iMaxSize - 1) && cursorPos == textLength && scanCode==EStdKeyFullStop)
+else if (cursorPos == (iMaxSize - 1) && cursorPos == textLength &&
+(scanCode == EStdKeyFullStop || scanCode == EStdKeyMinus))
 {
 SetCursorPositionL(iMaxSize);
 }
 HandleTextUpdateL(MEikEdwinObserver::EEventTextUpdate);
 TBool isFocused = IsFocused();
 // If there is no focus textbox should not consume keys
 if (isFocused)
 {
-//Error tone playing case2:
+// Error tone playing case2:
-//Play error tone if TextBox/TextField is read-only or maximum length has been reached.
+// Play error tone if TextBox/TextField is read-only or maximum length has been reached.
-//Here is handling of full keyboard keys(NOT 0...9) and all virtual keyboard keys.
+// Here is handling of full keyboard keys(NOT 0...9) and all virtual keyboard keys
-//(Note: Virtual keyboard sends only EEventKey type events, not up or down events)
+// (camera and menu key not included).
-//(Note: Error tone is played when there is no text to be replaced i.e. no text has been painted)
+// (Note: Virtual keyboard sends only EEventKey type events, not up or down events)
-if (!iEdwinUtils->IsNavigationKey(aKeyEvent) && !iEdwinUtils->IsHotKeyL(aKeyEvent, iCoeEnv) && !aKeyEvent.iCode == EKeyYes &&
+// (Note: Error tone is played when there is no text to be replaced i.e. no text has been painted)
-(!iKeyEventsPending || (scanCode < KKeyQwerty0  || scanCode > KKeyQwerty9)))
+if (!iEdwinUtils->IsNavigationKey(aKeyEvent) && !iEdwinUtils->IsHotKeyL(aKeyEvent, iCoeEnv) && aKeyEvent.iCode != EKeyYes &&
+(!iKeyEventsPending || (scanCode < KKeyQwerty0  || scanCode > KKeyQwerty9)) &&
+(aKeyEvent.iCode != EKeyApplication0 && scanCode != EStdKeyApplication0 &&
+aKeyEvent.iCode != EKeyApplication19 && scanCode != EStdKeyApplication19))
 {
 if (iEditor->IsReadOnly() || (Size() >= iMaxSize && aKeyEvent.iCode != EKeyBackspace))
 {
 //SelectionLength() > 0 if text has been selected/painted
 if (iEditor->SelectionLength() == 0)
 CPlainText* res = iEditor->Text();
 if (res && TChar(aKeyEvent.iCode) == TChar('-') &&
 Size() < iMaxSize)
 {
+TInt textLength = Size();
 res->InsertL(GetCaretPosition(), KMinusChar);
 // notify editor about the text changes
 iEditor->HandleTextChangedL();
+TInt cursorPos = GetCaretPosition();
 if (Size() < iMaxSize)
 {
 SetCursorPositionL(GetCaretPosition() + 1);
 }
+else if (cursorPos == (iMaxSize - 1) && cursorPos == textLength)
+{
+SetCursorPositionL(iMaxSize);
+}
 //Prevent changes that would result in an illegal string
 HandleTextUpdateL(MEikEdwinObserver::EEventTextUpdate);
 }
 }
 UpdateInitialInputModes();
 }
 else
 {
+// avoid po-pup dialog box blinking
+MakeVisible(EFalse);
 ExitSleepingDialog();
 #ifdef RD_SCALABLE_UI_V2
 SetPointerCapture(EFalse);
 #endif
 }
 }
 iThisMultitapKey = 0;   // reset key counter
 iLastMultitapKey = 0;
+if(iEditor->ScrollBarFrame())
+{
+iEditor->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff, CEikScrollBarFrame::EOff);
+}
 }
 TBool CMIDTextBoxQueryDialog::Showing()
 {
 return iShowing;
 * screen dynamic resolution change.
 */
 void CMIDTextBoxQueryDialog::HandleResourceChange(TInt aType)
 {
 CAknTextQueryDialog::HandleResourceChange(aType);
-if (aType == KEikDynamicLayoutVariantSwitch ||
+TRAP_IGNORE(UpdateScrollBarPositionL());
-aType == KEikColorResourceChange || aType == KAknsMessageSkinChange ||
-aType == KUidValueCoeColorSchemeChangeEvent)
-{
-TRAP_IGNORE(UpdateScrollBarPositionL());
-}
 }
 /* UpdateScrollBarPositionL
 *
 * This method is called for placing scrollbar to correct place in edwin
 */
 void CMIDTextBoxQueryDialog::UpdateScrollBarPositionL()
 {
-if(iEditor && iEditor->TextLayout())
+if (iEditor && iEditor->TextLayout())
 {
 TInt numLines = iEditor->TextLayout()->NumFormattedLines();
-if(numLines == iEditor->MaximumHeightInLines())
+if (numLines == iEditor->MaximumHeightInLines())
 {
-if(iEditor->ScrollBarFrame())
+if (iEditor->ScrollBarFrame())
 {
 iEditor->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff, CEikScrollBarFrame::EOff);
 }
 }
-else if(numLines > iEditor->MaximumHeightInLines())
+else if (numLines > iEditor->MaximumHeightInLines())
 {
-if(!iEditor->ScrollBarFrame())
+if (!iEditor->ScrollBarFrame())
 {
 iEditor->CreatePreAllocatedScrollBarFrameL();
 iEditor->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
 }
 TRect editorRect = iEditor->Rect();
-if(iEditor->ScrollBarFrame()->VerticalScrollBar())
+if (iEditor->ScrollBarFrame()->VerticalScrollBar())
 {
 editorRect.SetWidth(editorRect.Width() - iEditor->ScrollBarFrame()->VerticalScrollBar()->ScrollBarBreadth());
 iEditor->SetRect(editorRect);
 }
 }
 }
 }
+void CMIDTextBoxQueryDialog::PreLayoutDynInitL()
+{
+CAknQueryDialog::PreLayoutDynInitL();
+UpdateLeftSoftKeyL();
+}
 // End of file

branch	RCL_3
changeset 60	6c158198356e
parent 59	e5618cc85d74