views: Add support for OS and Chrome themes (fixes #3610, fixes #3671)

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.
This commit is contained in:
Marshall Greenblatt
2024-03-29 12:48:33 -04:00
parent 29c21f58e8
commit f60476b848
97 changed files with 2976 additions and 206 deletions

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=713287303ab9bbb6db24d8aabb340766f5e69461$
// $hash=48bce7be945d4e74682ffa41e8b45eb46a4f7589$
//
#include "libcef_dll/cpptoc/request_context_cpptoc.h"
@@ -553,6 +553,73 @@ request_context_set_content_setting(struct _cef_request_context_t* self,
CefString(requesting_url), CefString(top_level_url), content_type, value);
}
void CEF_CALLBACK
request_context_set_chrome_color_scheme(struct _cef_request_context_t* self,
cef_color_variant_t variant,
cef_color_t user_color) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Execute
CefRequestContextCppToC::Get(self)->SetChromeColorScheme(variant, user_color);
}
cef_color_variant_t CEF_CALLBACK request_context_get_chrome_color_scheme_mode(
struct _cef_request_context_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return CEF_COLOR_VARIANT_SYSTEM;
}
// Execute
cef_color_variant_t _retval =
CefRequestContextCppToC::Get(self)->GetChromeColorSchemeMode();
// Return type: simple
return _retval;
}
cef_color_t CEF_CALLBACK request_context_get_chrome_color_scheme_color(
struct _cef_request_context_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefRequestContextCppToC::Get(self)->GetChromeColorSchemeColor();
// Return type: simple
return _retval;
}
cef_color_variant_t CEF_CALLBACK
request_context_get_chrome_color_scheme_variant(
struct _cef_request_context_t* self) {
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return CEF_COLOR_VARIANT_SYSTEM;
}
// Execute
cef_color_variant_t _retval =
CefRequestContextCppToC::Get(self)->GetChromeColorSchemeVariant();
// Return type: simple
return _retval;
}
int CEF_CALLBACK
request_context_has_preference(struct _cef_preference_manager_t* self,
const cef_string_t* name) {
@@ -713,6 +780,14 @@ CefRequestContextCppToC::CefRequestContextCppToC() {
GetStruct()->set_website_setting = request_context_set_website_setting;
GetStruct()->get_content_setting = request_context_get_content_setting;
GetStruct()->set_content_setting = request_context_set_content_setting;
GetStruct()->set_chrome_color_scheme =
request_context_set_chrome_color_scheme;
GetStruct()->get_chrome_color_scheme_mode =
request_context_get_chrome_color_scheme_mode;
GetStruct()->get_chrome_color_scheme_color =
request_context_get_chrome_color_scheme_color;
GetStruct()->get_chrome_color_scheme_variant =
request_context_get_chrome_color_scheme_variant;
GetStruct()->base.has_preference = request_context_has_preference;
GetStruct()->base.get_preference = request_context_get_preference;
GetStruct()->base.get_all_preferences = request_context_get_all_preferences;

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=f0759e132185f8e6f0ee9e947f7e5ece3dddd5e7$
// $hash=07903b210017d0e545a381bb700088c689187b0e$
//
#include "libcef_dll/cpptoc/views/browser_view_cpptoc.h"
@@ -995,6 +995,26 @@ browser_view_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK browser_view_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefBrowserViewCppToC::Get(reinterpret_cast<cef_browser_view_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK browser_view_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1261,6 +1281,7 @@ CefBrowserViewCppToC::CefBrowserViewCppToC() {
GetStruct()->base.request_focus = browser_view_request_focus;
GetStruct()->base.set_background_color = browser_view_set_background_color;
GetStruct()->base.get_background_color = browser_view_get_background_color;
GetStruct()->base.get_theme_color = browser_view_get_theme_color;
GetStruct()->base.convert_point_to_screen =
browser_view_convert_point_to_screen;
GetStruct()->base.convert_point_from_screen =

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=3c4cb278397e9a07c8e5754650fe6944dd2a20ed$
// $hash=4e2f75d68d804ad2414eb34b9f273b8f558c3dab$
//
#include "libcef_dll/cpptoc/views/button_cpptoc.h"
@@ -950,6 +950,26 @@ cef_color_t CEF_CALLBACK button_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK button_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefButtonCppToC::Get(reinterpret_cast<cef_button_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK button_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1212,6 +1232,7 @@ CefButtonCppToC::CefButtonCppToC() {
GetStruct()->base.request_focus = button_request_focus;
GetStruct()->base.set_background_color = button_set_background_color;
GetStruct()->base.get_background_color = button_get_background_color;
GetStruct()->base.get_theme_color = button_get_theme_color;
GetStruct()->base.convert_point_to_screen = button_convert_point_to_screen;
GetStruct()->base.convert_point_from_screen =
button_convert_point_from_screen;

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=cc05a9116adf2a98d4b6169a86052a14e299cfeb$
// $hash=51a06f8ad654129497df44179105e8523e1234af$
//
#include "libcef_dll/cpptoc/views/label_button_cpptoc.h"
@@ -1228,6 +1228,26 @@ label_button_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK label_button_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefLabelButtonCppToC::Get(reinterpret_cast<cef_label_button_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK label_button_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1512,6 +1532,7 @@ CefLabelButtonCppToC::CefLabelButtonCppToC() {
label_button_set_background_color;
GetStruct()->base.base.get_background_color =
label_button_get_background_color;
GetStruct()->base.base.get_theme_color = label_button_get_theme_color;
GetStruct()->base.base.convert_point_to_screen =
label_button_convert_point_to_screen;
GetStruct()->base.base.convert_point_from_screen =

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=82aaa681d0ed57446e54a2c04a62adf18c284677$
// $hash=02040c0851514ead9307d3901c117d94d4fffb41$
//
#include "libcef_dll/cpptoc/views/menu_button_cpptoc.h"
@@ -1281,6 +1281,26 @@ menu_button_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK menu_button_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefMenuButtonCppToC::Get(reinterpret_cast<cef_menu_button_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK menu_button_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1569,6 +1589,7 @@ CefMenuButtonCppToC::CefMenuButtonCppToC() {
menu_button_set_background_color;
GetStruct()->base.base.base.get_background_color =
menu_button_get_background_color;
GetStruct()->base.base.base.get_theme_color = menu_button_get_theme_color;
GetStruct()->base.base.base.convert_point_to_screen =
menu_button_convert_point_to_screen;
GetStruct()->base.base.base.convert_point_from_screen =

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=9ec8f43a509317ec1eead47556f83ce953f041b8$
// $hash=4c768c4065540d40bfcc8da63dfa1916ca09f6f7$
//
#include "libcef_dll/cpptoc/views/panel_cpptoc.h"
@@ -1088,6 +1088,26 @@ cef_color_t CEF_CALLBACK panel_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK panel_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefPanelCppToC::Get(reinterpret_cast<cef_panel_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK panel_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1356,6 +1376,7 @@ CefPanelCppToC::CefPanelCppToC() {
GetStruct()->base.request_focus = panel_request_focus;
GetStruct()->base.set_background_color = panel_set_background_color;
GetStruct()->base.get_background_color = panel_get_background_color;
GetStruct()->base.get_theme_color = panel_get_theme_color;
GetStruct()->base.convert_point_to_screen = panel_convert_point_to_screen;
GetStruct()->base.convert_point_from_screen = panel_convert_point_from_screen;
GetStruct()->base.convert_point_to_window = panel_convert_point_to_window;

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=2ac2ff6e231398755ea6f2748985d21c0b4b1510$
// $hash=9c4a2548745464359046f080fa2a07d1438c208b$
//
#include "libcef_dll/cpptoc/views/scroll_view_cpptoc.h"
@@ -1017,6 +1017,26 @@ scroll_view_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK scroll_view_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefScrollViewCppToC::Get(reinterpret_cast<cef_scroll_view_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK scroll_view_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1286,6 +1306,7 @@ CefScrollViewCppToC::CefScrollViewCppToC() {
GetStruct()->base.request_focus = scroll_view_request_focus;
GetStruct()->base.set_background_color = scroll_view_set_background_color;
GetStruct()->base.get_background_color = scroll_view_get_background_color;
GetStruct()->base.get_theme_color = scroll_view_get_theme_color;
GetStruct()->base.convert_point_to_screen =
scroll_view_convert_point_to_screen;
GetStruct()->base.convert_point_from_screen =

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=f8d63e2a2ba174b0f7ffb1ae66052288c28b6c43$
// $hash=5407c7f442b7787de087a85d5613fffb384288c8$
//
#include "libcef_dll/cpptoc/views/textfield_cpptoc.h"
@@ -1447,6 +1447,26 @@ textfield_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK textfield_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefTextfieldCppToC::Get(reinterpret_cast<cef_textfield_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK textfield_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1741,6 +1761,7 @@ CefTextfieldCppToC::CefTextfieldCppToC() {
GetStruct()->base.request_focus = textfield_request_focus;
GetStruct()->base.set_background_color = textfield_set_background_color;
GetStruct()->base.get_background_color = textfield_get_background_color;
GetStruct()->base.get_theme_color = textfield_get_theme_color;
GetStruct()->base.convert_point_to_screen = textfield_convert_point_to_screen;
GetStruct()->base.convert_point_from_screen =
textfield_convert_point_from_screen;

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=a543a7ac4053e15e97e84a87f4275c23e9a35477$
// $hash=ae22b240b761b1bd2e9f168de2859ae0085191f6$
//
#include "libcef_dll/cpptoc/views/view_cpptoc.h"
@@ -788,6 +788,24 @@ cef_color_t CEF_CALLBACK view_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK view_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval = CefViewCppToC::Get(self)->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK view_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -1037,6 +1055,7 @@ CefViewCppToC::CefViewCppToC() {
GetStruct()->request_focus = view_request_focus;
GetStruct()->set_background_color = view_set_background_color;
GetStruct()->get_background_color = view_get_background_color;
GetStruct()->get_theme_color = view_get_theme_color;
GetStruct()->convert_point_to_screen = view_convert_point_to_screen;
GetStruct()->convert_point_from_screen = view_convert_point_from_screen;
GetStruct()->convert_point_to_window = view_convert_point_to_window;

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=a5f9a7de12728e82f8dee6d8dde3b9275a3e4ee4$
// $hash=b9df5830c3e1b042aeced2a2b5fd97d00e702869$
//
#include "libcef_dll/cpptoc/views/window_cpptoc.h"
@@ -721,6 +721,36 @@ void CEF_CALLBACK window_remove_all_accelerators(struct _cef_window_t* self) {
CefWindowCppToC::Get(self)->RemoveAllAccelerators();
}
void CEF_CALLBACK window_set_theme_color(struct _cef_window_t* self,
int color_id,
cef_color_t color) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Execute
CefWindowCppToC::Get(self)->SetThemeColor(color_id, color);
}
void CEF_CALLBACK window_theme_changed(struct _cef_window_t* self) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Execute
CefWindowCppToC::Get(self)->ThemeChanged();
}
struct _cef_window_t* CEF_CALLBACK window_as_window(struct _cef_panel_t* self) {
shutdown_checker::AssertNotShutdown();
@@ -1784,6 +1814,26 @@ cef_color_t CEF_CALLBACK window_get_background_color(struct _cef_view_t* self) {
return _retval;
}
cef_color_t CEF_CALLBACK window_get_theme_color(struct _cef_view_t* self,
int color_id) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return 0;
}
// Execute
cef_color_t _retval =
CefWindowCppToC::Get(reinterpret_cast<cef_window_t*>(self))
->GetThemeColor(color_id);
// Return type: simple
return _retval;
}
int CEF_CALLBACK window_convert_point_to_screen(struct _cef_view_t* self,
cef_point_t* point) {
shutdown_checker::AssertNotShutdown();
@@ -2035,6 +2085,8 @@ CefWindowCppToC::CefWindowCppToC() {
GetStruct()->set_accelerator = window_set_accelerator;
GetStruct()->remove_accelerator = window_remove_accelerator;
GetStruct()->remove_all_accelerators = window_remove_all_accelerators;
GetStruct()->set_theme_color = window_set_theme_color;
GetStruct()->theme_changed = window_theme_changed;
GetStruct()->base.as_window = window_as_window;
GetStruct()->base.set_to_fill_layout = window_set_to_fill_layout;
GetStruct()->base.set_to_box_layout = window_set_to_box_layout;
@@ -2092,6 +2144,7 @@ CefWindowCppToC::CefWindowCppToC() {
GetStruct()->base.base.request_focus = window_request_focus;
GetStruct()->base.base.set_background_color = window_set_background_color;
GetStruct()->base.base.get_background_color = window_get_background_color;
GetStruct()->base.base.get_theme_color = window_get_theme_color;
GetStruct()->base.base.convert_point_to_screen =
window_convert_point_to_screen;
GetStruct()->base.base.convert_point_from_screen =

View File

@@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=1829e6ed7282ca9a0b34e825a11c229ddd48590d$
// $hash=4350cb3f26c9b2a56bac5a0368eab19dff8659ae$
//
#include "libcef_dll/cpptoc/views/window_delegate_cpptoc.h"
@@ -532,6 +532,29 @@ window_delegate_on_key_event(struct _cef_window_delegate_t* self,
return _retval;
}
void CEF_CALLBACK
window_delegate_on_theme_colors_changed(struct _cef_window_delegate_t* self,
cef_window_t* window,
int chrome_theme) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Verify param: window; type: refptr_diff
DCHECK(window);
if (!window) {
return;
}
// Execute
CefWindowDelegateCppToC::Get(self)->OnThemeColorsChanged(
CefWindowCToCpp::Wrap(window), chrome_theme ? true : false);
}
cef_size_t CEF_CALLBACK
window_delegate_get_preferred_size(struct _cef_view_delegate_t* self,
cef_view_t* view) {
@@ -843,6 +866,8 @@ CefWindowDelegateCppToC::CefWindowDelegateCppToC() {
GetStruct()->can_close = window_delegate_can_close;
GetStruct()->on_accelerator = window_delegate_on_accelerator;
GetStruct()->on_key_event = window_delegate_on_key_event;
GetStruct()->on_theme_colors_changed =
window_delegate_on_theme_colors_changed;
GetStruct()->base.base.get_preferred_size =
window_delegate_get_preferred_size;
GetStruct()->base.base.get_minimum_size = window_delegate_get_minimum_size;