--- a/photosgallery/viewframework/views/cloudview/src/glxcloudviewcontrol.cpp	Wed Mar 31 21:31:03 2010 +0300
+++ b/photosgallery/viewframework/views/cloudview/src/glxcloudviewcontrol.cpp	Wed Apr 14 15:57:24 2010 +0300
@@ -63,7 +63,7 @@
 const TInt KLeftMargin = 10;
 const TInt KNumMinRowSpace = 2;
 const TInt KColSpace = 20;
-const TInt KRightmargin = 20;
+const TInt KRightmargin = 10;//Aligning Right margin
 const TInt KMinTagSize = 77;
 const TInt KTagScreenHeight = 460;
 const TReal KBoundaryMargin = 0.1; //10% = 10/100 = 0.1 
@@ -156,7 +156,7 @@
     AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
     iScreenHeight = rect.Height ();
     iParentLayout = CAlfLayout::AddNewL(*this, aAnchorLayout);                    
-    iTagScreenWidth = rect.Width() - iScrollPaneHandle.iW - KRightmargin;
+    iTagScreenWidth = rect.Width() - KRightmargin;
 
     if(IsLandscape())
         {	
@@ -230,7 +230,7 @@
        }
     TRect rect;
     AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
-    if ((rect.Width() != (iTagScreenWidth + iScrollPaneHandle.iW + KRightmargin)) || (rect.Height() != iScreenHeight))
+    if ((rect.Width() != (iTagScreenWidth + KRightmargin)) || (rect.Height() != iScreenHeight))
         {
         //set the new screen dimensions
         TRAP_IGNORE(UpdateLayoutL());
@@ -1849,10 +1849,14 @@
         if( iScrollEventData.mSpan )
             {       
             scrollbarbaselement->setThumbOpacity(1.0);  
+            //make scroll bar visible
+            scrollbarbaselement->setOpacity(1.0);
             }
         else
             {
             scrollbarbaselement->setThumbOpacity(0.0);  
+            //make scroll bar invisible
+            scrollbarbaselement->setOpacity(0.0);
             }
         }
     }
@@ -1865,11 +1869,11 @@
     {
     TRect rect;
     AknLayoutUtils::LayoutMetricsRect (AknLayoutUtils::EMainPane, rect);
-    if ((rect.Width() != (iTagScreenWidth + iScrollPaneHandle.iW + KRightmargin)) || (rect.Height() != iScreenHeight))
+    if ((rect.Width() != (iTagScreenWidth + KRightmargin)) || (rect.Height() != iScreenHeight))
         {
         //set the new screen dimensions
         iScreenHeight=rect.Height();
-       iTagScreenWidth = rect.Width()- iScrollPaneHandle.iW - KRightmargin;
+       iTagScreenWidth = rect.Width()- KRightmargin;
         if(IsLandscape())
             {   
             iTagScreenHeight = rect.Height();   
@@ -1996,6 +2000,10 @@
 void CGlxCloudViewControl::ShowContextItemMenu(TBool aShow)
     {
     iTagsContextMenuControl->ShowItemMenu(aShow);
+    if(!aShow)
+        {
+        iViewPortLayout->UpdateChildrenLayout(0);
+        }
     }
 
 //End of file