--- a/mulwidgets/alfscrollbarwidget/src/alfscrollbardefaultbaseelement.cpp Wed Sep 15 12:47:28 2010 +0300
+++ b/mulwidgets/alfscrollbarwidget/src/alfscrollbardefaultbaseelement.cpp Wed Oct 13 15:08:19 2010 +0300
@@ -1323,15 +1323,12 @@
//
bool AlfScrollBarDefaultBaseElement::isScrollbarTrackVisual(CAlfVisual *aVisual)
{
- if(aVisual)
+ if(aVisual == mData->mExtendedTrackLayout ||
+ aVisual == mData->mTrackTopImage ||
+ aVisual == mData->mTrackMiddleImage ||
+ aVisual == mData->mTrackEndImage)
{
- if(aVisual == mData->mExtendedTrackLayout ||
- aVisual == mData->mTrackTopImage ||
- aVisual == mData->mTrackMiddleImage ||
- aVisual == mData->mTrackEndImage)
- {
- return true;
- }
+ return true;
}
return false;
}
@@ -1343,15 +1340,12 @@
//
bool AlfScrollBarDefaultBaseElement::isScrollbarThumbVisual(CAlfVisual *aVisual)
{
- if(aVisual)
+ if(aVisual == mData->mExtendedThumbLayout ||
+ aVisual == mData->mThumbTopImage ||
+ aVisual == mData->mThumbMiddleImage ||
+ aVisual == mData->mThumbEndImage)
{
- if(aVisual == mData->mExtendedThumbLayout ||
- aVisual == mData->mThumbTopImage ||
- aVisual == mData->mThumbMiddleImage ||
- aVisual == mData->mThumbEndImage)
- {
- return true;
- }
+ return true;
}
return false;
}