mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
759cdc7584
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.
75 lines
2.5 KiB
C++
75 lines
2.5 KiB
C++
// Copyright 2016 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.
|
|
|
|
#ifndef CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_VIEW_H_
|
|
#define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_VIEW_H_
|
|
#pragma once
|
|
|
|
#include "include/views/cef_browser_view_delegate.h"
|
|
|
|
#include "libcef/browser/views/view_view.h"
|
|
|
|
#include "ui/views/controls/webview/webview.h"
|
|
|
|
// Extend views::WebView with a no-argument constructor as required by the
|
|
// CefViewView template.
|
|
class WebViewEx : public views::WebView {
|
|
public:
|
|
WebViewEx() : views::WebView(nullptr) {
|
|
// Mouse events on draggable regions will not be handled by the WebView.
|
|
// Avoid the resulting DCHECK in NativeViewHost::OnMousePressed by
|
|
// configuring the NativeViewHost not to process events via the view
|
|
// hierarchy.
|
|
holder()->SetCanProcessEventsWithinSubtree(false);
|
|
}
|
|
};
|
|
|
|
class CefBrowserViewView
|
|
: public CefViewView<WebViewEx, CefBrowserViewDelegate> {
|
|
public:
|
|
using ParentClass = CefViewView<WebViewEx, CefBrowserViewDelegate>;
|
|
|
|
CefBrowserViewView(const CefBrowserViewView&) = delete;
|
|
CefBrowserViewView& operator=(const CefBrowserViewView&) = delete;
|
|
|
|
class Delegate {
|
|
public:
|
|
// Called when the BrowserView has been added to a parent view.
|
|
virtual void OnBrowserViewAdded() = 0;
|
|
|
|
// Called when the BrowserView is added or removed from a Widget.
|
|
virtual void AddedToWidget() = 0;
|
|
virtual void RemovedFromWidget() = 0;
|
|
|
|
// Called when the BrowserView bounds have changed.
|
|
virtual void OnBoundsChanged() = 0;
|
|
|
|
// Called when the BrowserView receives a gesture event.
|
|
// Returns true if the gesture was handled.
|
|
virtual bool OnGestureEvent(ui::GestureEvent* event) = 0;
|
|
|
|
protected:
|
|
virtual ~Delegate() = default;
|
|
};
|
|
|
|
// |cef_delegate| may be nullptr.
|
|
// |browser_view_delegate| must be non-nullptr.
|
|
CefBrowserViewView(CefBrowserViewDelegate* cef_delegate,
|
|
Delegate* browser_view_delegate);
|
|
|
|
// View methods:
|
|
void ViewHierarchyChanged(
|
|
const views::ViewHierarchyChangedDetails& details) override;
|
|
void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
|
|
void OnGestureEvent(ui::GestureEvent* event) override;
|
|
void AddedToWidget() override;
|
|
void RemovedFromWidget() override;
|
|
|
|
private:
|
|
// Not owned by this object.
|
|
Delegate* browser_view_delegate_;
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_VIEW_H_
|