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

equal deleted inserted replaced

-:e5618cc85d74
+:6c158198356e
 CAknControl::SetDimmed(coeParent.IsDimmed());
 UpdateDefaultFontL();
 DoSetFont(&iDefaultFont->Font());
 UpdateMarginValues();
-UpdateSkinColor();
 SetBackground(this);   // Back will be drawn by ASwtControlBase::Draw
 #ifdef RD_TACTILE_FEEDBACK
 iFeedback = MTouchFeedback::Instance();
 #endif // RD_TACTILE_FEEDBACK
 UpdateDefaultFontL();
 DoSetFont(&iDefaultFont->Font());
 UpdateMarginValues();
 BuildDrawableFragmentsListL(TextRect());
 }
-else if (aType == KAknsMessageSkinChange)
+}
-{
-if (!iCustomTextColor)
-{
-UpdateSkinColor();
-}
-}
-}
-/**
-* Updates skin colors
-*/
-void CSwtLink::UpdateSkinColor()
-{
-AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
-iTextColor,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG6);
-AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
-iLinkColor,
-KAknsIIDQsnHighlightColors,
-EAknsCIQsnHighlightColorsCG3);
-AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
-iHighlightColor,
-KAknsIIDQsnHighlightColors,
-EAknsCIQsnHighlightColorsCG2);
-AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
-iHighlightedLinkColor,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG24);
-}
 /**
 * Updates default font
 */
 void CSwtLink::UpdateDefaultFontL()
 {
 CSwtDrawableLinkFragment* fragment = iDrawableLinkFragments[i];
 TRect rect = fragment->Rect();
 rect.Move(textRect.iTl);
-TRgb textColor = iTextColor;
+TRgb textColor = TextColor();
 if (fragment->FragmentDescriptor()->Target())
 {
-textColor = iLinkColor;
+textColor = LinkColor();
 }
 // Same background highlight as that of HyperLink
 if (fragment->FragmentDescriptor() == iFocusedFragment
 && (iPressed || iDisplay.UiUtils().NaviKeyInput()))
 {
-textColor = iHighlightedLinkColor;
+textColor = PressedLinkColor();
 gc.SetPenStyle(CGraphicsContext::ENullPen);
 gc.SetBrushStyle(CGraphicsContext::ESolidBrush);
-gc.SetBrushColor(iHighlightColor);
+gc.SetBrushColor(LinkBgColor());
 gc.DrawRect(rect);
 }
 gc.UseFont(font);
 gc.SetPenStyle(CGraphicsContext::ESolidPen);
 }
 #endif //RD_JAVA_ADVANCED_TACTILE_FEEDBACK
 if (iPressed)
 {
-Redraw();
+GetShell().UpdateHighlight(ETrue); // draw now
 }
 break;
 }
 case TPointerEvent::EDrag:
 iPressed = EFalse;
 }
 if (pressed != iPressed)
 {
-Redraw();
+GetShell().UpdateHighlight(ETrue); // draw now
 }
 break;
 }
 case TPointerEvent::EButton1Up:
 iDisplay.PostSelectionEventL(iPeer, *iFocusedFragment->Target());
 }
 if (pressed != iPressed)
 {
-Redraw();
+GetShell().UpdateHighlight(ETrue); // draw now
 }
 break;
 }
 }
 // ---------------------------------------------------------------------------
 //
 void CSwtLink::SetForegroundL(const MSwtColor* aColor)
 {
 ASwtControlBase::DoSetForegroundL(aColor);
-aColor ? iCustomTextColor = ETrue : iCustomTextColor = EFalse;
+iCustomFg = aColor;
-if (iCustomTextColor)
-{
-TRgb rgb;
-TBool overrideColorSet(GetColor(EColorControlText, rgb));
-ASSERT(overrideColorSet);
-iTextColor = rgb;
-iLinkColor = rgb;
-}
-else
-{
-UpdateSkinColor();
-}
 Redraw();
 }
 // ---------------------------------------------------------------------------
 // From class MSwtControl.
 // ---------------------------------------------------------------------------
 //
 TSize CSwtLink::ComputeSizeL(TInt aWHint, TInt aHHint)
 }
 return ComputeTextSizeL(aWHint, aHHint);
 }
+// ---------------------------------------------------------------------------
+// CSwtLink::DefaultFont
+// From MSwtControl
+// ---------------------------------------------------------------------------
+//
+void CSwtLink::SetFontL(const MSwtFont* aFont)
+{
+ASwtControlBase::DoSetFontL(aFont);
+DoSetFont(&GetFont()->Font());
+Redraw();
+}
+TBool CSwtLink::SetSwtFocus(TInt aReason /*= KSwtFocusByApi*/)
+{
+TBool prevFocused = IsFocusControl();
+TBool res = ASwtControlBase::SetSwtFocus(aReason);
+// Gaines focus by pointer
+if (IsFocusControl() && !prevFocused)
+{
+iFocusChanged = ETrue;
+}
+return res;
+}
+TInt CSwtLink::PressBackgroundPolicy() const
+{
+return EEmbeddedPressBackground;
+}
 // ---------------------------------------------------------------------------
 // CSwtLink::ComputeTextSizeL
 // ---------------------------------------------------------------------------
 //
 result = ETrue;
 }
 return result;
 }
-// ---------------------------------------------------------------------------
+TRgb CSwtLink::TextColor() const
-// CSwtLink::DefaultFont
+{
-// From MSwtControl
+TBool highlighted = HasHighlight();
-// ---------------------------------------------------------------------------
+if (!highlighted && iCustomFg)
-//
+{
-void CSwtLink::SetFontL(const MSwtFont* aFont)
+return iCustomFg->RgbValue();
-{
+}
-ASwtControlBase::DoSetFontL(aFont);
+else
-DoSetFont(&GetFont()->Font());
+{
-Redraw();
+TRgb res(0);
-}
+AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
+res,
+KAknsIIDQsnTextColors,
+highlighted ? KHighlightedTextColor : KNonHighlightedTextColor);
+return res;
+}
+}
+TRgb CSwtLink::LinkColor() const
+{
+TBool highlighted = HasHighlight();
+if (!highlighted && iCustomFg)
+{
+return iCustomFg->RgbValue();
+}
+else
+{
+TRgb res(0);
+AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
+res,
+KAknsIIDQsnHighlightColors,
+EAknsCIQsnHighlightColorsCG3);
+return res;
+}
+}
+TRgb CSwtLink::PressedLinkColor() const
+{
+TRgb res(0);
+AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
+res,
+KAknsIIDQsnTextColors,
+EAknsCIQsnTextColorsCG24);
+return res;
+}
+TRgb CSwtLink::LinkBgColor() const
+{
+TRgb res(0);
+AknsUtils::GetCachedColor(AknsUtils::SkinInstance(),
+res,
+KAknsIIDQsnHighlightColors,
+EAknsCIQsnHighlightColorsCG2);
+return res;
+}
 void CSwtLink::DoSetFont(const CFont* aFont)
 {
 iLineGap = Max(aFont->FontLineGap() - aFont->FontMaxHeight(),
 KSwtMinLinePadding);
 {
 iFocusedFragment = NULL;
 }
 }
-TBool CSwtLink::SetSwtFocus(TInt aReason /*= KSwtFocusByApi*/)
-{
-TBool prevFocused = IsFocusControl();
-TBool res = ASwtControlBase::SetSwtFocus(aReason);
-// Gaines focus by pointer
-if (IsFocusControl() && !prevFocused)
-{
-iFocusChanged = ETrue;
-}
-return res;
-}
 // ---------------------------------------------------------------------------
 // CSwtLinkFragmentDescriptor
 // ---------------------------------------------------------------------------
 //
 /**

branch	RCL_3
changeset 60	6c158198356e
parent 34	71c436fe3ce0