209 iFocused != iMessageField && |
209 iFocused != iMessageField && |
210 iFocused != iReadOnlyQuoteField ) |
210 iFocused != iReadOnlyQuoteField ) |
211 { |
211 { |
212 iFocused = iHeader; |
212 iFocused = iHeader; |
213 } |
213 } |
214 iFocused->SetFocus( ETrue, aDrawNow ); |
214 if ( iFocused == iHeader ) |
|
215 { |
|
216 iHeader->ShowCursor( IsFocused() ); |
|
217 iFocused->SetFocus( ETrue, aDrawNow ); |
|
218 } |
|
219 else if ( iFocused == iMessageField ) |
|
220 { |
|
221 iFocused->SetFocus( IsFocused(), aDrawNow ); |
|
222 } |
|
223 else |
|
224 { |
|
225 iFocused->SetFocus( ETrue, aDrawNow ); |
|
226 } |
|
227 |
215 iView.HandleContainerChangeRequiringToolbarRefresh(); |
228 iView.HandleContainerChangeRequiringToolbarRefresh(); |
216 |
229 |
217 if ( aDrawNow ) |
230 if ( aDrawNow ) |
218 { |
231 { |
219 DrawNow(); |
232 DrawNow(); |
309 } |
322 } |
310 else |
323 else |
311 { |
324 { |
312 if ( iFocused == iHeader ) |
325 if ( iFocused == iHeader ) |
313 { |
326 { |
|
327 // fix for ESLX-7Y4C2V, dissapearing subject |
|
328 HBufC* heapBuffer = HBufC::NewL(iHeader->GetSubjectFieldLength()); |
|
329 TPtr ptr(heapBuffer->Des()); |
|
330 ptr.Copy(*GetSubjectLC()); |
|
331 |
314 iFocused = iMessageField; |
332 iFocused = iMessageField; |
315 iHeader->SetFocus( EFalse, EDrawNow ); |
333 iHeader->SetFocus( EFalse, EDrawNow ); |
316 iMessageField->SetFocus( ETrue, EDrawNow ); |
334 iMessageField->SetFocus( ETrue, EDrawNow ); |
|
335 |
|
336 if ( iHeader->GetSubjectFieldLength() != heapBuffer->Length() ) |
|
337 { |
|
338 iHeader->SetSubjectL( const_cast<HBufC&>(*heapBuffer)); |
|
339 } |
|
340 |
|
341 iHeader->SetFocus( ETrue, EDrawNow ); |
|
342 iHeader->SetFocus( EFalse, EDrawNow ); |
317 iView.HandleContainerChangeRequiringToolbarRefresh(); |
343 iView.HandleContainerChangeRequiringToolbarRefresh(); |
|
344 CleanupStack::PopAndDestroy(); //from GetSubjectLC() |
318 } |
345 } |
319 else if ( iFocused == iReadOnlyQuoteField ) |
346 else if ( iFocused == iReadOnlyQuoteField ) |
320 { |
347 { |
321 iFocused = iMessageField; |
348 iFocused = iMessageField; |
322 iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow ); |
349 iReadOnlyQuoteField->SetFocus( EFalse, EDrawNow ); |
1517 // ----------------------------------------------------------------------------- |
1544 // ----------------------------------------------------------------------------- |
1518 // |
1545 // |
1519 void CNcsComposeViewContainer::AppendToFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddresses ) |
1546 void CNcsComposeViewContainer::AppendToFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddresses ) |
1520 { |
1547 { |
1521 FUNC_LOG; |
1548 FUNC_LOG; |
1522 |
1549 FixSemicolonL(); |
1523 iHeader->AppendToFieldAddressesL(aAddresses); |
1550 iHeader->AppendToFieldAddressesL(aAddresses); |
1524 |
1551 |
1525 } |
1552 } |
1526 |
1553 |
1527 // ----------------------------------------------------------------------------- |
1554 // ----------------------------------------------------------------------------- |
1530 // ----------------------------------------------------------------------------- |
1557 // ----------------------------------------------------------------------------- |
1531 // |
1558 // |
1532 void CNcsComposeViewContainer::AppendCcFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress ) |
1559 void CNcsComposeViewContainer::AppendCcFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress ) |
1533 { |
1560 { |
1534 FUNC_LOG; |
1561 FUNC_LOG; |
1535 |
1562 FixSemicolonL(); |
1536 iHeader->AppendCcFieldAddressesL( aAddress ); |
1563 iHeader->AppendCcFieldAddressesL( aAddress ); |
1537 |
1564 |
1538 } |
1565 } |
1539 |
1566 |
1540 // ----------------------------------------------------------------------------- |
1567 // ----------------------------------------------------------------------------- |
1543 // ----------------------------------------------------------------------------- |
1570 // ----------------------------------------------------------------------------- |
1544 // |
1571 // |
1545 void CNcsComposeViewContainer::AppendBccFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress ) |
1572 void CNcsComposeViewContainer::AppendBccFieldAddressesL( RPointerArray<CNcsEmailAddressObject>& aAddress ) |
1546 { |
1573 { |
1547 FUNC_LOG; |
1574 FUNC_LOG; |
1548 |
1575 FixSemicolonL(); |
1549 iHeader->AppendBccFieldAddressesL( aAddress ); |
1576 iHeader->AppendBccFieldAddressesL( aAddress ); |
1550 |
1577 |
1551 } |
1578 } |
1552 |
1579 |
1553 // ----------------------------------------------------------------------------- |
1580 // ----------------------------------------------------------------------------- |