Kaydet (Commit) 243fbdf4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Abstract out repeated code into a lambda

...to silence a clang-analyzer-deadcode.DeadStores on the last update of nX

Change-Id: Ifeb2e5294b22270ba134a303fbe5aa1d50025c75
üst a868478b
...@@ -1318,52 +1318,37 @@ void TabBar::Resize() ...@@ -1318,52 +1318,37 @@ void TabBar::Resize()
} }
// order the scroll buttons // order the scroll buttons
long nHeight = aNewSize.Height(); long const nHeight = aNewSize.Height();
// adapt font height? // adapt font height?
ImplInitSettings( true, false ); ImplInitSettings( true, false );
long nButtonMargin = BUTTON_MARGIN * GetDPIScaleFactor(); long nButtonMargin = BUTTON_MARGIN * GetDPIScaleFactor();
long nX = mbMirrored ? (aNewSize.Width() - nHeight - nButtonMargin) : nButtonMargin; long nX = mbMirrored ? (aNewSize.Width() - nHeight - nButtonMargin) : nButtonMargin;
long nXDiff = mbMirrored ? -nHeight : nHeight; long const nXDiff = mbMirrored ? -nHeight : nHeight;
nButtonWidth += nButtonMargin; nButtonWidth += nButtonMargin;
Size aBtnSize( nHeight, nHeight ); Size const aBtnSize( nHeight, nHeight );
if (mpImpl->mpFirstButton) auto setButton = [aBtnSize, nXDiff, nHeight, &nX, &nButtonWidth](
{ ScopedVclPtr<ImplTabButton> const & button)
mpImpl->mpFirstButton->SetPosSizePixel( Point( nX, 0 ), aBtnSize );
nX += nXDiff;
nButtonWidth += nHeight;
}
if (mpImpl->mpPrevButton)
{
mpImpl->mpPrevButton->SetPosSizePixel( Point( nX, 0 ), aBtnSize );
nX += nXDiff;
nButtonWidth += nHeight;
}
if (mpImpl->mpNextButton)
{
mpImpl->mpNextButton->SetPosSizePixel( Point( nX, 0 ), aBtnSize );
nX += nXDiff;
nButtonWidth += nHeight;
}
if (mpImpl->mpLastButton)
{ {
mpImpl->mpLastButton->SetPosSizePixel( Point( nX, 0 ), aBtnSize ); if (button) {
nX += nXDiff; button->SetPosSizePixel(Point(nX, 0), aBtnSize);
nButtonWidth += nHeight; nX += nXDiff;
} nButtonWidth += nHeight;
}
};
setButton(mpImpl->mpFirstButton);
setButton(mpImpl->mpPrevButton);
setButton(mpImpl->mpNextButton);
setButton(mpImpl->mpLastButton);
nButtonWidth += nButtonMargin; nButtonWidth += nButtonMargin;
nX += mbMirrored ? -nButtonMargin : nButtonMargin; nX += mbMirrored ? -nButtonMargin : nButtonMargin;
if (mpImpl->mpAddButton) setButton(mpImpl->mpAddButton);
{
mpImpl->mpAddButton->SetPosSizePixel( Point( nX, 0 ), aBtnSize );
nX += nXDiff;
nButtonWidth += nHeight;
}
nButtonWidth += nButtonMargin; nButtonWidth += nButtonMargin;
......
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