javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcombo.cpp
branchRCL_3
changeset 19 71c436fe3ce0
parent 14 04becd199f91
child 24 6c158198356e
--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcombo.cpp	Tue May 25 12:34:19 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtcombo.cpp	Wed Jun 09 09:34:07 2010 +0300
@@ -293,7 +293,11 @@
     }
 
     if (pressed != iPressed)
+    {
         Redraw();
+    }
+
+    PostMouseEventL(aPointerEvent);
 }
 #endif //RD_SCALABLE_UI_V2
 
@@ -314,7 +318,23 @@
 //
 void CSwtCombo::Draw(const TRect& /*aRect*/) const
 {
-    DrawContainedComboBorder();
+    CWindowGc& gc = SystemGc();
+    TRect rect(iCombo->Rect());
+    TAknLayoutRect topLeft = CSwtLafFacade::GetLayoutRect(
+                                 CSwtLafFacade::EListHighlightSkinPlacingGeneralLine2, rect);
+
+    TAknLayoutRect bottomRight = CSwtLafFacade::GetLayoutRect(
+                                     CSwtLafFacade::EListHighlightSkinPlacingGeneralLine5, rect);
+
+    TRect innerRect(topLeft.Rect().iBr, bottomRight.Rect().iTl);
+
+    // "Connect" the label and the button with a toolbar frame.
+    AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(),
+                             gc,
+                             rect,
+                             innerRect,
+                             iPressed || iOpen ? KAknsIIDQsnFrButtonTbPressed : KAknsIIDQsnFrButtonTb,
+                             iPressed || iOpen ? KAknsIIDQsnFrButtonTbCenterPressed : KAknsIIDQsnFrButtonTbCenter);
 }
 
 // ---------------------------------------------------------------------------
@@ -1452,17 +1472,3 @@
 #endif //RD_TACTILE_FEEDBACK
 }
 
-// ---------------------------------------------------------------------------
-// CSwtCombo::DrawContainedComboBorder()
-// ---------------------------------------------------------------------------
-//
-void CSwtCombo::DrawContainedComboBorder() const
-{
-    CWindowGc& gc = SystemGc();
-    gc.SetBrushStyle(CGraphicsContext::ENullBrush);
-    gc.SetPenColor(iDisplay.UiUtils().GetSystemColor(ESwtColorWidgetBorder));
-    gc.SetPenStyle(CGraphicsContext::ESolidPen);
-    gc.SetPenSize(TSize(1, 1));
-    gc.DrawRect(iCombo->Rect());
-}
-