--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtlink.h Thu Jul 15 18:31:06 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtlink.h Thu Aug 19 09:48:13 2010 +0300
@@ -54,7 +54,6 @@
TInt aStyle);
void ConstructL();
void SwtHandleResourceChangeL(TInt aType);
- void UpdateSkinColor();
void UpdateDefaultFontL();
void UpdateMarginValues();
TRect TextRect() const;
@@ -100,7 +99,10 @@
const TInt aCurrentLineIndex) const;
void SetFocusedFragment();
TBool IsRtl() const;
-
+ TRgb TextColor() const;
+ TRgb LinkColor() const;
+ TRgb LinkBgColor() const;
+ TRgb PressedLinkColor() const;
// From base class CCoeControl
public:
@@ -126,6 +128,7 @@
TSize ComputeSizeL(TInt aWHint, TInt aHHint);
void SetFontL(const MSwtFont* aFont);
TBool SetSwtFocus(TInt aReason = KSwtFocusByApi);
+ TInt PressBackgroundPolicy() const;
// From base class ASwtControlBase
protected:
@@ -173,29 +176,10 @@
TInt iLineHeight;
/**
- * Plain text fragment text color.
- */
- TRgb iTextColor;
-
- /**
- * Link fragment text color.
- */
- TRgb iLinkColor;
-
- /**
- * Link fragment text color when highlighted.
+ * Custom foreground color used by the text and non pressed links.
+ * Not own.
*/
- TRgb iHighlightedLinkColor;
-
- /**
- * Link fragment back highlight color.
- */
- TRgb iHighlightColor;
-
- /**
- * True if currently used text color is a color set by the Java application.
- */
- TBool iCustomTextColor;
+ const MSwtColor* iCustomFg;
/**
* The margins used for text positioning when drawing.
@@ -226,12 +210,6 @@
const CSwtLinkFragmentDescriptor* iFocusedFragment;
/**
- * True for as long as pressed by pointer.
- * Eclipses ASwtControlBase::iPressed!
- */
- TBool iPressed;
-
- /**
* True if 2 or more targets.
*/
TBool iMultipleTargets;