From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: msizanoen1 Date: Tue, 19 Jul 2022 05:11:06 +0200 Subject: Add maximized parameter to LinuxUI::GetWindowFrameProvider This allows ClientFrameViewLinux to instruct the toolkit to draw the window decorations in maximized mode where needed, preventing empty space caused by decoration shadows and rounded titlebars around the window while maximized. diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc index 5d3a403deea6b299bf1797d19f8485cfed4555ab..f93a0e157202602d08132bbfe293a64c2eeabc50 100644 --- a/ui/gtk/gtk_ui.cc +++ b/ui/gtk/gtk_ui.cc @@ -514,13 +514,15 @@ std::unique_ptr GtkUi::CreateNavButtonProvider() { return nullptr; } -ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame) { +ui::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame, bool maximized) { if (!GtkCheckVersion(3, 14)) return nullptr; auto& provider = - solid_frame ? solid_frame_provider_ : transparent_frame_provider_; + maximized + ? (solid_frame ? solid_maximized_frame_provider_ : transparent_maximized_frame_provider_) + : (solid_frame ? solid_frame_provider_ : transparent_frame_provider_); if (!provider) - provider = std::make_unique(solid_frame); + provider = std::make_unique(solid_frame, maximized); return provider.get(); } diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h index ebc31db3dad9ba7904fbd345c6a1ba31ed6fd813..1d2ffc82bb67ed80f508631c8c7d045be76f6761 100644 --- a/ui/gtk/gtk_ui.h +++ b/ui/gtk/gtk_ui.h @@ -106,7 +106,7 @@ class GtkUi : public ui::LinuxUiAndTheme { SkColor GetInactiveSelectionFgColor() const override; bool PreferDarkTheme() const override; std::unique_ptr CreateNavButtonProvider() override; - ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override; + ui::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) override; private: using TintMap = std::map; @@ -195,10 +195,13 @@ class GtkUi : public ui::LinuxUiAndTheme { // while Chrome is running. std::unique_ptr solid_frame_provider_; std::unique_ptr transparent_frame_provider_; + std::unique_ptr solid_maximized_frame_provider_; + std::unique_ptr transparent_maximized_frame_provider_; // Objects to notify when the window frame button order changes. base::ObserverList::Unchecked window_button_order_observer_list_; + }; } // namespace gtk diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc index c7857a3e316554e6b5f46c023a1a8084a3263074..5ad7d4ffa7e9c12ec4640a845a4c763420c23ec2 100644 --- a/ui/gtk/window_frame_provider_gtk.cc +++ b/ui/gtk/window_frame_provider_gtk.cc @@ -38,16 +38,18 @@ std::string GetThemeName() { return theme_string; } -GtkCssContext WindowContext(bool solid_frame, bool focused) { +GtkCssContext WindowContext(bool solid_frame, bool maximized, bool focused) { std::string selector = "#window.background."; selector += solid_frame ? "solid-csd" : "csd"; + if (maximized) + selector += ".maximized"; if (!focused) selector += ":inactive"; return AppendCssNodeToStyleContext({}, selector); } -GtkCssContext DecorationContext(bool solid_frame, bool focused) { - auto context = WindowContext(solid_frame, focused); +GtkCssContext DecorationContext(bool solid_frame, bool maximized, bool focused) { + auto context = WindowContext(solid_frame, maximized, focused); // GTK4 renders the decoration directly on the window. if (!GtkCheckVersion(4)) context = AppendCssNodeToStyleContext(context, "#decoration"); @@ -64,8 +66,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) { return context; } -GtkCssContext HeaderContext(bool solid_frame, bool focused) { - auto context = WindowContext(solid_frame, focused); +GtkCssContext HeaderContext(bool solid_frame, bool maximized, bool focused) { + auto context = WindowContext(solid_frame, maximized, focused); context = AppendCssNodeToStyleContext(context, "#headerbar.header-bar.titlebar"); if (!focused) @@ -110,8 +112,8 @@ int ComputeTopCornerRadius() { // need to experimentally determine the corner radius by rendering a sample. // Additionally, in GTK4, the headerbar corners get clipped by the window // rather than the headerbar having its own rounded corners. - auto context = GtkCheckVersion(4) ? DecorationContext(false, false) - : HeaderContext(false, false); + auto context = GtkCheckVersion(4) ? DecorationContext(false, false, false) + : HeaderContext(false, false, false); ApplyCssToContext(context, R"(window, headerbar { background-image: none; background-color: black; @@ -169,8 +171,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom( unfocused_bitmap = src.unfocused_bitmap; } -WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame) - : solid_frame_(solid_frame) {} +WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame, bool maximized) + : solid_frame_(solid_frame), maximized_(maximized) {} WindowFrameProviderGtk::~WindowFrameProviderGtk() = default; @@ -272,7 +274,7 @@ void WindowFrameProviderGtk::PaintWindowFrame( top_area_height_dip * scale - effective_frame_thickness_px.top(); auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px}, - HeaderContext(solid_frame_, focused), scale); + HeaderContext(solid_frame_, maximized_, focused), scale); image = gfx::ImageSkia::CreateFrom1xBitmap(header); // In GTK4, the headerbar gets clipped by the window. if (GtkCheckVersion(4)) { @@ -304,7 +306,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip, 2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip); - auto focused_context = DecorationContext(solid_frame_, true); + auto focused_context = DecorationContext(solid_frame_, maximized_, true); frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context)); frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context)); gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset)); @@ -312,7 +314,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) { PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale); asset.unfocused_bitmap = PaintBitmap(bitmap_size, frame_bounds_dip, - DecorationContext(solid_frame_, false), scale); + DecorationContext(solid_frame_, maximized_, false), scale); // In GTK4, there's no way to obtain the frame thickness from CSS values // directly, so we must determine it experimentally based on the drawn diff --git a/ui/gtk/window_frame_provider_gtk.h b/ui/gtk/window_frame_provider_gtk.h index d8cb2c6aab333cc55ad1daa70ac91b0569d33a7c..558aa3979301f79df789a29ba3ad1cf134bd6494 100644 --- a/ui/gtk/window_frame_provider_gtk.h +++ b/ui/gtk/window_frame_provider_gtk.h @@ -14,7 +14,7 @@ namespace gtk { class WindowFrameProviderGtk : public ui::WindowFrameProvider { public: - explicit WindowFrameProviderGtk(bool solid_frame); + explicit WindowFrameProviderGtk(bool solid_frame, bool maximized); WindowFrameProviderGtk(const WindowFrameProviderGtk&) = delete; WindowFrameProviderGtk& operator=(const WindowFrameProviderGtk&) = delete; @@ -70,6 +70,9 @@ class WindowFrameProviderGtk : public ui::WindowFrameProvider { // Cached bitmaps and metrics. The scale is rounded to percent. base::flat_map assets_; + + // Whether to draw the window decorations as maximized. + bool maximized_; }; } // namespace gtk diff --git a/ui/linux/linux_ui.h b/ui/linux/linux_ui.h index b5fd57741d2f47bda9499cf10e73cc9b3dd1b4dc..35e5bedb719af699485b575ece4bdb4f90df07df 100644 --- a/ui/linux/linux_ui.h +++ b/ui/linux/linux_ui.h @@ -273,7 +273,7 @@ class COMPONENT_EXPORT(LINUX_UI) LinuxUiTheme { // if transparency is unsupported and the frame should be rendered opaque. // The returned object is not owned by the caller and will remain alive until // the process ends. - virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) = 0; + virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) = 0; protected: LinuxUiTheme();