Commit a7702f58 authored by Shawn Gallea's avatar Shawn Gallea Committed by Commit Bot

EXO: Change FullscreenShellSurface to correctly set widget bounds

Set params.bounds for widget within FullscreenShellSurface

Bug: 896710
Test: FullscreenShellSurfaceTest.Bounds
Change-Id: I250e99c177a2fd4ad15fab64d5a7929195441cb6
Reviewed-on: https://chromium-review.googlesource.com/c/1336000
Commit-Queue: Shawn Gallea <sagallea@google.com>
Reviewed-by: default avatarDaniel Nicoara <dnicoara@chromium.org>
Reviewed-by: default avatarDaniele Castagna <dcastagna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608793}
parent b5839a5a
...@@ -269,6 +269,7 @@ void FullscreenShellSurface::CreateFullscreenShellSurfaceWidget( ...@@ -269,6 +269,7 @@ void FullscreenShellSurface::CreateFullscreenShellSurfaceWidget(
params.show_state = show_state; params.show_state = show_state;
params.activatable = views::Widget::InitParams::ACTIVATABLE_YES; params.activatable = views::Widget::InitParams::ACTIVATABLE_YES;
params.parent = WMHelper::GetInstance()->GetRootWindowForNewWindows(); params.parent = WMHelper::GetInstance()->GetRootWindowForNewWindows();
params.bounds = gfx::Rect(params.parent->bounds().size());
widget_ = new views::Widget(); widget_ = new views::Widget();
widget_->Init(params); widget_->Init(params);
......
...@@ -156,5 +156,25 @@ TEST_F(FullscreenShellSurfaceTest, Minimize) { ...@@ -156,5 +156,25 @@ TEST_F(FullscreenShellSurfaceTest, Minimize) {
EXPECT_TRUE(fullscreen_surface->GetWidget()->IsMinimized()); EXPECT_TRUE(fullscreen_surface->GetWidget()->IsMinimized());
} }
TEST_F(FullscreenShellSurfaceTest, Bounds) {
aura::Window* root_window =
WMHelper::GetInstance()->GetRootWindowForNewWindows();
gfx::Rect new_root_bounds(10, 10, 100, 100);
root_window->SetBounds(new_root_bounds);
gfx::Size buffer_size(64, 64);
std::unique_ptr<Buffer> buffer(new Buffer(
CreateGpuMemoryBuffer(buffer_size, gfx::BufferFormat::RGBA_8888)));
std::unique_ptr<Surface> surface(new Surface);
std::unique_ptr<FullscreenShellSurface> fullscreen_surface(
new FullscreenShellSurface(surface.get()));
surface->Attach(buffer.get());
surface->Commit();
gfx::Rect fullscreen_bounds =
fullscreen_surface->GetWidget()->GetWindowBoundsInScreen();
EXPECT_EQ(fullscreen_bounds.size(), new_root_bounds.size());
}
} // namespace } // namespace
} // namespace exo } // namespace exo
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