FCL/sf/app/jrt: comparison javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swttextbase.cpp

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 if (charFormat.iFontSpec.iFontStyle.Posture() == EPostureItalic)
 {
 charMask.SetAttrib(EAttFontPosture);
 }
-// when we set the new font color also changes. So we have to set the color again.
+TRgb color(0);
-if (!iTextColor)
+TInt err(KErrNone);
-{
-TRgb color;
+if (HasHighlight())
-AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), color,
+{
-KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6);
+err = AknsUtils::GetCachedColor(AknsUtils::SkinInstance()
-charFormat.iFontPresentation.iTextColor = color;
+, color
-charMask.SetAttrib(EAttColor);
+, KAknsIIDQsnTextColors
-}
+, KHighlightedTextColor);
-else
+if (err == KErrNone)
+{
+charFormat.iFontPresentation.iTextColor = color;
+charMask.SetAttrib(EAttColor);
+}
+}
+else if (iTextColor)
 {
 charFormat.iFontPresentation.iTextColor = GetForeground();
 charMask.SetAttrib(EAttColor);
+}
+else
+{
+err = AknsUtils::GetCachedColor(AknsUtils::SkinInstance()
+, color
+, KAknsIIDQsnTextColors
+, KNonHighlightedTextColor);
+if (err == KErrNone)
+{
+charFormat.iFontPresentation.iTextColor = color;
+charMask.SetAttrib(EAttColor);
+}
 }
 if (iStyle & KSwtStyleSingle)
 {
 CCharFormatLayer* charFormatLayer = CCharFormatLayer::NewL(charFormat, charMask);
 // ---------------------------------------------------------------------------
 //
 void CSwtTextBase::SetForegroundL(const MSwtColor* aColor)
 {
 ASwtControlBase::DoSetForegroundL(aColor);
-TRgb color(aColor ? aColor->RgbValue() :
-iDisplay.CoeEnv()->Color(EColorControlText));
+iTextColor = ETrue;
-if (iEditor)
+if (!aColor)
+{
+iTextColor = EFalse;
+}
+else if (iEditor)
 {
 TCharFormat charFormat;
 TCharFormatMask charMask;
-charFormat.iFontPresentation.iTextColor=color;
+charFormat.iFontPresentation.iTextColor = aColor->RgbValue();
 charMask.SetAttrib(EAttColor);
 static_cast<CGlobalText*>(iEditor->Text())->
 ApplyCharFormatL(charFormat, charMask, 0, iEditor->TextLength());
-iTextColor = ETrue;
+}
-}
+UpdateTextColor();
 Redraw();
 }
 void CSwtTextBase::SetBounds(const TRect& aRect)
 {
 {
 fep->HandleDestructionOfFocusedItem();
 }
 }
 return ASwtScrollableBase::Dispose();
+}
+TInt CSwtTextBase::PressBackgroundPolicy() const
+{
+return EPressBackground;
+}
+void CSwtTextBase::UpdateTextColor()
+{
+if (iEditor)
+{
+TCharFormat charFormat;
+TCharFormatMask charMask;
+TRgb color(0);
+TInt err(KErrNone);
+if (HasHighlight())
+{
+// Highlighted foreground color, overrides all others.
+err = AknsUtils::GetCachedColor(AknsUtils::SkinInstance()
+, color
+, KAknsIIDQsnTextColors
+, KHighlightedTextColor);
+if (err == KErrNone)
+{
+charFormat.iFontPresentation.iTextColor = color;
+}
+}
+else if (iTextColor)
+{
+// Custom foreground color, overrides the default.
+charFormat.iFontPresentation.iTextColor = GetForeground();
+}
+else
+{
+// Default foreground color.
+err = AknsUtils::GetCachedColor(AknsUtils::SkinInstance()
+, color
+, KAknsIIDQsnTextColors
+, KNonHighlightedTextColor);
+if (err == KErrNone)
+{
+charFormat.iFontPresentation.iTextColor = color;
+}
+}
+charMask.SetAttrib(EAttColor);
+TRAP_IGNORE(static_cast<CGlobalText*>(iEditor->Text())->
+ApplyCharFormatL(charFormat, charMask, 0, iEditor->TextLength()));
+}
+}
+void CSwtTextBase::HandleHighlightChange()
+{
+UpdateTextColor();
 }
 // ---------------------------------------------------------------------------
 // CSwtTextBase::ComputeDelta
 // ---------------------------------------------------------------------------
 {
 CCoeControl::HandleResourceChange(aType);
 if (aType == KAknsMessageSkinChange || aType == KEikDynamicLayoutVariantSwitch)
 {
+// The highlight color will be updated from ProcessFontUpdateL()
 if (!iFont)
 {
-RetrieveDefaultFontL();
+RetrieveDefaultFontL(); // ProcessFontUpdateL() will get called also.
 }
 else
 {
 ProcessFontUpdateL();
 }
 if (iVScrollBarGrabsPointerEvents && vsb)
 {
 vsb->HandlePointerEventL(aPointerEvent);
 }
+TBool forward(EFalse);
+TPointerEvent pointerEvent(aPointerEvent);
 // Edwin tap. Button1Up after the long tap is not forwarded to the editor
 if (!(aPointerEvent.iType == TPointerEvent::EButton1Up
 && (iDisplay.RevertPointerEvent() || !hit))
 && !iVScrollBarGrabsPointerEvents
 && !iIgnorePointerDown)
 {
-TPointerEvent pointerEvent(aPointerEvent);
 // If clicking on margins, move the pointer event.
 TRect viewRect(iEditor->TextView()->ViewRect());
 TRect viewRectWithoutMargins(viewRect);
 viewRectWithoutMargins.Shrink(2, 2);    // well inside the edges
 {
 pointerEvent.iPosition.iY = viewRectWithoutMargins.iBr.iY;
 }
 }
-iEditor->HandlePointerEventL(pointerEvent);
+forward = ETrue;
 }
 // Stop scrollbar grabbing
 if (aPointerEvent.iType == TPointerEvent::EButton1Up)
 {
 {
 iPressed = hit && !iVScrollBarGrabsPointerEvents && !isActiveSplitEditor;
 }
 if (pressed != iPressed)
-Redraw();
+{
+GetShell().UpdateHighlight(ETrue); // draw now
+}
 #endif
 #ifndef RD_JAVA_S60_RELEASE_9_2
 // We got a pointer event, so any subsequent events should not be ignored.
 iIgnorePointerDown = EFalse;
 #endif // RD_JAVA_S60_RELEASE_9_2
+// Forwarding this late due to splitview + pressed flicker issues.
+if (forward)
+{
+iEditor->HandlePointerEventL(pointerEvent);
+}
 PostMouseEventL(aPointerEvent);
 }
 #else //RD_SCALABLE_UI_V2
 void CSwtTextBase::HandlePointerEventL(
 #endif // RD_JAVA_S60_RELEASE_9_2
 return ASwtControlBase::SetSwtFocus(aReason);
 }
 // ---------------------------------------------------------------------------
-// CSwtTextBase::FocusBackgroundPolicy
-// From MSwtControl
-// While background color is set, the editor's control context must be null,
-// otherwise there will be ugly background drawing problems while typing.
-// ---------------------------------------------------------------------------
-//
-TInt CSwtTextBase::FocusBackgroundPolicy() const
-{
-if (!IsDefaultBackgroundUse())
-{
-return EEmbeddedFocusBackground;
-}
-else
-{
-return ASwtControlBase::FocusBackgroundPolicy();
-}
-};
-// ---------------------------------------------------------------------------
 // CSwtTextBase::ClientRect
 // From MSwtControl
 // ---------------------------------------------------------------------------
 //
 TRect CSwtTextBase::ClientRect() const

branch	RCL_3
changeset 60	6c158198356e
parent 34	71c436fe3ce0