diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 12:52:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:36:21 +0000 |
| commit | 06cb2df4dba489d83c44babc2b36f91ec9fde5c9 (patch) | |
| tree | 60fe7312ed0de3ffd3eddc2a90e449086a8aed9c /vcl/source/window/layout.cxx | |
| parent | a6dacbe1d7d17283c20c75d3c97f72a0f876a716 (diff) | |
Convert VclAlign to scoped enum
Change-Id: I03718cc63ec5c1260ebd599bddb1a787ca8f5788
Reviewed-on: https://gerrit.libreoffice.org/25603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/window/layout.cxx')
| -rw-r--r-- | vcl/source/window/layout.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 5e82e4a7c017..b099a9681021 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -56,7 +56,7 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild, const Point &rAllocP VclAlign eValign = rChild.get_valign(); //typical case - if (eHalign == VCL_ALIGN_FILL && eValign == VCL_ALIGN_FILL) + if (eHalign == VclAlign::Fill && eValign == VclAlign::Fill) { setLayoutPosSize(rChild, rAllocPos, rChildAlloc); return; @@ -68,19 +68,19 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild, const Point &rAllocP switch (eHalign) { - case VCL_ALIGN_FILL: + case VclAlign::Fill: break; - case VCL_ALIGN_START: + case VclAlign::Start: if (aChildPreferredSize.Width() < rChildAlloc.Width()) aChildSize.Width() = aChildPreferredSize.Width(); break; - case VCL_ALIGN_END: + case VclAlign::End: if (aChildPreferredSize.Width() < rChildAlloc.Width()) aChildSize.Width() = aChildPreferredSize.Width(); aChildPos.X() += rChildAlloc.Width(); aChildPos.X() -= aChildSize.Width(); break; - case VCL_ALIGN_CENTER: + case VclAlign::Center: if (aChildPreferredSize.Width() < aChildSize.Width()) aChildSize.Width() = aChildPreferredSize.Width(); aChildPos.X() += (rChildAlloc.Width() - aChildSize.Width()) / 2; @@ -89,19 +89,19 @@ void VclContainer::setLayoutAllocation(vcl::Window &rChild, const Point &rAllocP switch (eValign) { - case VCL_ALIGN_FILL: + case VclAlign::Fill: break; - case VCL_ALIGN_START: + case VclAlign::Start: if (aChildPreferredSize.Height() < rChildAlloc.Height()) aChildSize.Height() = aChildPreferredSize.Height(); break; - case VCL_ALIGN_END: + case VclAlign::End: if (aChildPreferredSize.Height() < rChildAlloc.Height()) aChildSize.Height() = aChildPreferredSize.Height(); aChildPos.Y() += rChildAlloc.Height(); aChildPos.Y() -= aChildSize.Height(); break; - case VCL_ALIGN_CENTER: + case VclAlign::Center: if (aChildPreferredSize.Height() < aChildSize.Height()) aChildSize.Height() = aChildPreferredSize.Height(); aChildPos.Y() += (rChildAlloc.Height() - aChildSize.Height()) / 2; @@ -2171,7 +2171,7 @@ short MessageDialog::Execute() } m_pImage->set_grid_left_attach(0); m_pImage->set_grid_top_attach(0); - m_pImage->set_valign(VCL_ALIGN_START); + m_pImage->set_valign(VclAlign::Start); m_pImage->Show(); WinBits nWinStyle = WB_CLIPCHILDREN | WB_LEFT | WB_VCENTER | WB_NOLABEL | WB_NOTABSTOP; |