mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 09:08:06 +01:00
f60476b848
Controls now respect OS and Chrome themes by default for both Alloy
and Chrome runtimes. Chrome themes (mode and colors) can be configured
using the new CefRequestContext::SetChromeColorScheme method. Individual
theme colors can be overridden using the new CefWindowDelegate::
OnThemeColorsChanged and CefWindow::SetThemeColor methods.
The `--force-light-mode` and `--force-dark-mode` command-line flags are
now respected on all platforms as an override for the OS theme.
The current Chrome theme, if any, will take precedence over the OS theme
when determining light/dark status. On Windows and MacOS the titlebar
color will also be updated to match the light/dark theme.
Testable as follows:
- Run: `cefclient --enable-chrome-runtime` OR
`cefclient --use-views --persist-user-preferences --cache-path=...`
- App launches with default OS light/dark theme colors.
- Change OS dark/light theme under system settings. Notice that theme
colors change as expected.
- Right click, select items from the new Theme sub-menu. Notice that
theme colors behave as expected.
- Exit and relaunch the app. Notice that the last-used theme colors are
applied on app restart.
- Add `--background-color=green` to above command-line.
- Perform the same actions as above. Notice that all controls start
and remain green throughout (except some icons with Chrome runtime).
- Add `--force-light-mode` or `--force-dark-mode` to above command-line.
- Perform the same actions as above. Notice that OS dark/light theme
changes are ignored, but Chrome theme changes work as expected.
105 lines
2.8 KiB
Plaintext
105 lines
2.8 KiB
Plaintext
// Copyright 2021 The Chromium Embedded Framework Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be found
|
|
// in the LICENSE file.
|
|
|
|
#include "libcef/browser/views/view_util.h"
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
|
|
#include "include/internal/cef_types_mac.h"
|
|
#include "libcef/browser/views/native_widget_mac.h"
|
|
|
|
#include "ui/views/widget/widget.h"
|
|
|
|
namespace view_util {
|
|
|
|
namespace {
|
|
|
|
constexpr char kNativeHostViewKey[] = "CefNativeHostViewKey";
|
|
|
|
// For Venura 13.3.1.
|
|
constexpr float kDefaultTitleBarHeight = 30;
|
|
|
|
NSWindow* GetNSWindow(views::Widget* widget) {
|
|
if (const auto& window = GetNativeWindow(widget)) {
|
|
return window.GetNativeNSWindow();
|
|
}
|
|
return nil;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
gfx::NativeWindow GetNativeWindow(views::Widget* widget) {
|
|
if (widget) {
|
|
return widget->GetNativeWindow();
|
|
}
|
|
return gfx::NativeWindow();
|
|
}
|
|
|
|
gfx::NativeView GetNativeView(views::Widget* widget) {
|
|
if (widget) {
|
|
return widget->GetNativeView();
|
|
}
|
|
return gfx::NativeView();
|
|
}
|
|
|
|
CefWindowHandle GetWindowHandle(views::Widget* widget) {
|
|
// |view| is a wrapper type from native_widget_types.h.
|
|
auto view = GetNativeView(widget);
|
|
if (view) {
|
|
return CAST_NSVIEW_TO_CEF_WINDOW_HANDLE(view.GetNativeNSView());
|
|
}
|
|
return kNullWindowHandle;
|
|
}
|
|
|
|
CefWindowHandle GetWindowHandle(gfx::NativeWindow window) {
|
|
// |window| is a wrapper type from native_widget_types.h.
|
|
if (window) {
|
|
NSWindow* nswindow = window.GetNativeNSWindow();
|
|
return CAST_NSVIEW_TO_CEF_WINDOW_HANDLE([nswindow contentView]);
|
|
}
|
|
return kNullWindowHandle;
|
|
}
|
|
|
|
views::NativeWidget* CreateNativeWidget(
|
|
views::internal::NativeWidgetDelegate* delegate,
|
|
CefRefPtr<CefWindow> window,
|
|
CefWindowDelegate* window_delegate) {
|
|
return new CefNativeWidgetMac(delegate, window, window_delegate);
|
|
}
|
|
|
|
void SetHostView(views::Widget* widget, views::View* host_view) {
|
|
widget->SetNativeWindowProperty(kNativeHostViewKey, host_view);
|
|
}
|
|
|
|
views::View* GetHostView(const views::Widget* widget) {
|
|
return static_cast<views::View*>(
|
|
widget->GetNativeWindowProperty(kNativeHostViewKey));
|
|
}
|
|
|
|
float GetNSWindowTitleBarHeight(views::Widget* widget) {
|
|
if (NSWindow* window = GetNSWindow(widget)) {
|
|
return window.frame.size.height -
|
|
[window contentRectForFrameRect:window.frame].size.height;
|
|
}
|
|
return kDefaultTitleBarHeight;
|
|
}
|
|
|
|
void UpdateTitlebarTheme(views::Widget* widget) {
|
|
NSWindow* window = GetNSWindow(widget);
|
|
if (!window) {
|
|
return;
|
|
}
|
|
|
|
auto* light = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
|
|
auto* dark = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
|
|
|
|
const bool should_use_dark = ShouldUseDarkTheme(widget);
|
|
auto* desired = should_use_dark ? dark : light;
|
|
if (window.appearance != desired) {
|
|
window.appearance = desired;
|
|
}
|
|
}
|
|
|
|
} // namespace view_util
|