--- a/uifw/ganes/src/HgScroller.cpp Thu Jul 15 18:56:19 2010 +0300
+++ b/uifw/ganes/src/HgScroller.cpp Thu Aug 19 10:11:06 2010 +0300
@@ -241,9 +241,9 @@
if( iMarkingObserver )
{
TRAP_IGNORE( iMarkingObserver->HandleMarkingL( aIndex, ETrue ) );
- }
+ }
}
- }
+ }
}
// -----------------------------------------------------------------------------
@@ -592,7 +592,8 @@
if( iDetector
&& iSelectedIndex != KErrNotFound
- && !HasHighlight()
+ && !HasHighlight()
+ && !(iFlags & EHgScrollerSelectionMode)
&& iActionMenu->InitMenuL() )
{
iDetector->PointerEventL( aEvent );
@@ -1195,7 +1196,7 @@
}
else if( iItemCount )
{
- iSelectedIndex = iCurrentRow;
+ iSelectedIndex = CurrentIndex();
FitSelectionToView();
iShowHighlight = ETrue;
iDrawUtils->EnableMarquee(HasHighlight());
@@ -1732,6 +1733,9 @@
iScrollbar = CHgScrollbar::NewL(*this);
InitScrollbarL();
InitGraphicsL();
+
+ HandleSizeChanged();
+ DrawDeferred();
}
)
}
@@ -1743,7 +1747,7 @@
void CHgScroller::HandleLongTapEventL( const TPoint& /*aPenEventLocation*/,
const TPoint& aPenEventScreenLocation)
{
- if( iActionMenu )
+ if( iActionMenu && !(iFlags & EHgScrollerSelectionMode) )
{
iOldWinPos = DrawableWindow()->OrdinalPosition();
iActionMenu->ShowMenuL(aPenEventScreenLocation);