use GetPreferredSize(SizeBounds) instead of GetPreferredSize() in //app
Bug: 40232718 Change-Id: Icf170128f13332bac579ff024fef20c1d0c1df09 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5420369 Reviewed-by: Toni Barzic <tbarzic@chromium.org> Commit-Queue: Weidong Liu <weidongliu@chromium.org> Cr-Commit-Position: refs/heads/main@{#1282334}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
4e32d814e8
commit
3869f54fd9
@@ -240,7 +240,7 @@ void AppWindowFrameView::SizeConstraintsChanged() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gfx::Size AppWindowFrameView::CalculatePreferredSize() const {
|
gfx::Size AppWindowFrameView::CalculatePreferredSize() const {
|
||||||
gfx::Size pref = widget_->client_view()->GetPreferredSize();
|
gfx::Size pref = widget_->client_view()->GetPreferredSize({});
|
||||||
gfx::Rect bounds(0, 0, pref.width(), pref.height());
|
gfx::Rect bounds(0, 0, pref.width(), pref.height());
|
||||||
return widget_->non_client_view()
|
return widget_->non_client_view()
|
||||||
->GetWindowBoundsForClientBounds(bounds)
|
->GetWindowBoundsForClientBounds(bounds)
|
||||||
@@ -263,7 +263,7 @@ void AppWindowFrameView::Layout(PassKey) {
|
|||||||
const int kRightMargin = 3;
|
const int kRightMargin = 3;
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||||
|
|
||||||
gfx::Size close_size = close_button_->GetPreferredSize();
|
gfx::Size close_size = close_button_->GetPreferredSize({});
|
||||||
close_button_->SetBounds(width() - kRightMargin - close_size.width(),
|
close_button_->SetBounds(width() - kRightMargin - close_size.width(),
|
||||||
kButtonOffsetY,
|
kButtonOffsetY,
|
||||||
close_size.width(),
|
close_size.width(),
|
||||||
@@ -271,13 +271,13 @@ void AppWindowFrameView::Layout(PassKey) {
|
|||||||
|
|
||||||
maximize_button_->SetEnabled(widget_->widget_delegate() &&
|
maximize_button_->SetEnabled(widget_->widget_delegate() &&
|
||||||
widget_->widget_delegate()->CanMaximize());
|
widget_->widget_delegate()->CanMaximize());
|
||||||
gfx::Size maximize_size = maximize_button_->GetPreferredSize();
|
gfx::Size maximize_size = maximize_button_->GetPreferredSize({});
|
||||||
maximize_button_->SetBounds(
|
maximize_button_->SetBounds(
|
||||||
close_button_->x() - kButtonSpacing - maximize_size.width(),
|
close_button_->x() - kButtonSpacing - maximize_size.width(),
|
||||||
kButtonOffsetY,
|
kButtonOffsetY,
|
||||||
maximize_size.width(),
|
maximize_size.width(),
|
||||||
maximize_size.height());
|
maximize_size.height());
|
||||||
gfx::Size restore_size = restore_button_->GetPreferredSize();
|
gfx::Size restore_size = restore_button_->GetPreferredSize({});
|
||||||
restore_button_->SetBounds(
|
restore_button_->SetBounds(
|
||||||
close_button_->x() - kButtonSpacing - restore_size.width(),
|
close_button_->x() - kButtonSpacing - restore_size.width(),
|
||||||
kButtonOffsetY,
|
kButtonOffsetY,
|
||||||
@@ -292,7 +292,7 @@ void AppWindowFrameView::Layout(PassKey) {
|
|||||||
else
|
else
|
||||||
restore_button_->SetState(views::Button::STATE_NORMAL);
|
restore_button_->SetState(views::Button::STATE_NORMAL);
|
||||||
|
|
||||||
gfx::Size minimize_size = minimize_button_->GetPreferredSize();
|
gfx::Size minimize_size = minimize_button_->GetPreferredSize({});
|
||||||
minimize_button_->SetState(views::Button::STATE_NORMAL);
|
minimize_button_->SetState(views::Button::STATE_NORMAL);
|
||||||
minimize_button_->SetBounds(
|
minimize_button_->SetBounds(
|
||||||
maximize_button_->x() - kButtonSpacing - minimize_size.width(),
|
maximize_button_->x() - kButtonSpacing - minimize_size.width(),
|
||||||
|
Reference in New Issue
Block a user