Skip to content
Snippets Groups Projects
Commit 4ebf8e3a authored by Richard Linden's avatar Richard Linden
Browse files

fix for gcc build

parent af142618
Branches
Tags
No related merge requests found
...@@ -419,7 +419,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize) ...@@ -419,7 +419,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
&& !force_resize)) && !force_resize))
{ {
S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight(); S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight();
F32 relevant_min = ((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); S32 relevant_min = llround((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim);
shrink_headroom_total += relevant_dimension - relevant_min; shrink_headroom_total += relevant_dimension - relevant_min;
} }
...@@ -428,7 +428,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize) ...@@ -428,7 +428,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
num_resizable_panels++; num_resizable_panels++;
S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight(); S32 relevant_dimension = (mOrientation == HORIZONTAL) ? (*panel_it)->getRect().getWidth() : (*panel_it)->getRect().getHeight();
F32 relevant_min = ((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim); S32 relevant_min = llround((*panel_it)->mCollapsed ? (*panel_it)->getRelevantMinDim() : (*panel_it)->mExpandedMinDim);
shrink_headroom_available += relevant_dimension - relevant_min; shrink_headroom_available += relevant_dimension - relevant_min;
shrink_headroom_total += relevant_dimension - relevant_min; shrink_headroom_total += relevant_dimension - relevant_min;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment