Skip to content

Add GTK-themed client-side decoration for Wayland without xdg-decoration #4178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pdecarvalhogomes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add GTK-themed client-side decoration for Wayland without xdg-decoration #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,12 +1042,16 @@ source_set("libcef_static") {
"libcef/browser/osr/browser_platform_delegate_osr_linux.h",
"libcef/browser/printing/print_dialog_linux.cc",
"libcef/browser/printing/print_dialog_linux.h",
"libcef/browser/views/linux_frame_view.cc",
"libcef/browser/views/linux_frame_view.h",
"libcef/common/util_linux.h",
"libcef/common/util_linux.cc",
]

deps += [
"//third_party/fontconfig",
"//ui/linux:linux_ui",
"//ui/linux:linux_ui_factory",
]

if (ozone_platform_x11) {
Expand Down
17 changes: 17 additions & 0 deletions libcef/browser/chrome/views/chrome_browser_widget.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
#include "chrome/browser/ui/browser_window/public/browser_window_features.h"
#include "chrome/browser/ui/views/frame/browser_view.h"

#if BUILDFLAG(IS_LINUX)
#include "cef/libcef/browser/views/linux_frame_view.h"
#include "ui/views/view_utils.h"
#endif

#if BUILDFLAG(IS_MAC)
#include "cef/libcef/browser/views/native_widget_mac.h"
#include "cef/libcef/browser/views/view_util.h"
Expand Down Expand Up @@ -245,6 +250,18 @@ void ChromeBrowserWidget::OnNativeWidgetDestroyed() {
}
}

gfx::Insets ChromeBrowserWidget::GetCustomInsetsInDIP() const {
#if BUILDFLAG(IS_LINUX)
if (non_client_view() && non_client_view()->frame_view()) {
if (auto* linux_frame = views::AsViewClass<LinuxFrameView>(
non_client_view()->frame_view())) {
return linux_frame->GetFrameBorderInsets();
}
}
#endif
return Widget::GetCustomInsetsInDIP();
}

void ChromeBrowserWidget::OnNativeThemeUpdated(
ui::NativeTheme* observed_theme) {
// TODO: Reduce the frequency of this callback on Windows/Linux.
Expand Down
3 changes: 3 additions & 0 deletions libcef/browser/chrome/views/chrome_browser_widget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ class ChromeBrowserWidget : public BrowserWidget,
// NativeWidgetDelegate methods:
void OnNativeWidgetDestroyed() override;

// views::Widget methods:
gfx::Insets GetCustomInsetsInDIP() const override;

// ui::NativeThemeObserver methods:
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
ui::ColorProviderKey GetColorProviderKey() const override;
Expand Down
Loading