Commit 587d462e authored by NiranV's avatar NiranV

Fixed: Scroll container contents scrolling "outside" of the rect and into...

Fixed: Scroll container contents scrolling "outside" of the rect and into other stuff slightly overlapping.
parent e7975650
......@@ -94,7 +94,7 @@ void LLAccordionCtrl::draw()
// clear this flag to be set on next call to autoScroll
mAutoScrolling = false;
LLRect local_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
LLRect local_rect(0, getRect().getHeight() - 4, getRect().getWidth(), 0);
LLLocalClipRect clip(local_rect);
......
......@@ -526,9 +526,9 @@ void LLScrollContainer::draw()
calcVisibleSize( &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
LLLocalClipRect clip(LLRect(mInnerRect.mLeft,
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + visible_height,
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + visible_height - 2,
mInnerRect.mRight - (show_v_scrollbar ? scrollbar_size: 0),
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0)
mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + 1
));
drawChild(mScrolledView);
}
......
......@@ -28,17 +28,17 @@ width="310">
border="false"
background_visible="false"
follows="all"
height="388"
height="387"
label=""
layout="topleft"
left="5"
name="accordion_panel"
top_pad="4"
top_pad="5"
width="319">
<accordion
layout="topleft"
follows="all"
height ="385"
height ="384"
left="1"
name="wearable_accordion"
top="0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment