diff --git a/headers/os/interface/View.h b/headers/os/interface/View.h index 81c7d6ab68..fa9a56a3c5 100644 --- a/headers/os/interface/View.h +++ b/headers/os/interface/View.h @@ -509,7 +509,7 @@ public: virtual BSize MinSize(); virtual BSize MaxSize(); virtual BSize PreferredSize(); - virtual BAlignment Alignment(); + virtual BAlignment LayoutAlignment(); void SetExplicitMinSize(BSize size); void SetExplicitMaxSize(BSize size); diff --git a/src/kits/interface/LayoutUtils.cpp b/src/kits/interface/LayoutUtils.cpp index 5129b8199f..51b02f4f54 100644 --- a/src/kits/interface/LayoutUtils.cpp +++ b/src/kits/interface/LayoutUtils.cpp @@ -170,7 +170,7 @@ void BLayoutUtils::AlignInFrame(BView* view, BRect frame) { BSize maxSize = view->MaxSize(); - BAlignment alignment = view->Alignment(); + BAlignment alignment = view->LayoutAlignment(); if (view->HasHeightForWidth()) { // The view has height for width, so we do the horizontal alignment diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index 886f57283f..5349d768ab 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -3939,7 +3939,7 @@ BView::PreferredSize() BAlignment -BView::Alignment() +BView::LayoutAlignment() { return BLayoutUtils::ComposeAlignment(fLayoutData->fAlignment, (fLayoutData->fLayout ? fLayoutData->fLayout->Alignment() diff --git a/src/kits/interface/ViewLayoutItem.cpp b/src/kits/interface/ViewLayoutItem.cpp index f51fd6af33..47ed990790 100644 --- a/src/kits/interface/ViewLayoutItem.cpp +++ b/src/kits/interface/ViewLayoutItem.cpp @@ -44,7 +44,7 @@ BViewLayoutItem::PreferredSize() BAlignment BViewLayoutItem::Alignment() { - return fView->Alignment(); + return fView->LayoutAlignment(); } // SetExplicitMinSize