diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-15 23:10:56 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-06-15 23:11:22 +0300 |
| commit | 44e746c2068aa983c15336277fc8f988fcb94303 (patch) | |
| tree | 01d9410b3f23176c70212cd3e5714463ef290d33 /indra/llui | |
| parent | 4de5576fb4bea538f3381f581d3caf54ee03fb05 (diff) | |
Revert "SL-18977 Borders of inventory view in inventory floater seem to be cut a bit"
This reverts commit 7ac094e92105122b22b4693dafae7f0cee72d9a0.
Commit breaks gallery panel, it is not ready.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 8 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 5872b79bb0..c4cb739f0a 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -124,9 +124,9 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams); LLView::addChild( mScrollbar[VERTICAL] ); - LLRect horizontal_scroll_rect; - horizontal_scroll_rect.mRight = mInnerRect.getWidth(); - horizontal_scroll_rect.mTop = scrollbar_size; + LLRect horizontal_scroll_rect = mInnerRect; + horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size; + horizontal_scroll_rect.mLeft += 3; sbparams.name("scrollable horizontal"); sbparams.rect(horizontal_scroll_rect); sbparams.orientation(LLScrollbar::HORIZONTAL); @@ -135,7 +135,7 @@ LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p) sbparams.page_size(mInnerRect.getWidth()); sbparams.step_size(VERTICAL_MULTIPLE); sbparams.visible(false); - sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM); + sbparams.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT); sbparams.change_callback(p.scroll_callback); mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams); LLView::addChild( mScrollbar[HORIZONTAL] ); diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index d5d337848c..8c841540a5 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -986,7 +986,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) // Tab panel S32 tab_panel_top; S32 tab_panel_bottom; - if (!getTabsHidden()) + if (!getTabsHidden()) { if( getTabPosition() == LLTabContainer::TOP ) { @@ -1002,7 +1002,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) } else { - // Skip tab button space if tabs are invisible (EXT-576) + //Scip tab button space if they are invisible(EXT - 576) tab_panel_top = getRect().getHeight(); tab_panel_bottom = LLPANEL_BORDER_WIDTH; } @@ -1017,9 +1017,9 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) } else { - tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH * 2, + tab_panel_rect = LLRect(LLPANEL_BORDER_WIDTH, tab_panel_top, - getRect().getWidth(), + getRect().getWidth()-LLPANEL_BORDER_WIDTH, tab_panel_bottom ); } child->setFollowsAll(); |