mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: make window visual effect state customizable (#25083)

Browse source
This commit is contained in:
Shelley Vohr 2020-08-24 08:44:48 -07:00 • committed by GitHub
parent c0440a35f2
commit 024ea32313
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/native_window_mac.h
View file

@ -158,6 +158,12 @@ class NativeWindowMac : public NativeWindow, public ui::NativeThemeObserver {
gfx::Point GetTrafficLightPosition() const override;
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
enum class VisualEffectState {
FOLLOW_WINDOW,
ACTIVE,
INACTIVE,
};
enum class TitleBarStyle {
NORMAL,
HIDDEN,
@ -219,6 +225,9 @@ class NativeWindowMac : public NativeWindow, public ui::NativeThemeObserver {
// The "titleBarStyle" option.
TitleBarStyle title_bar_style_ = TitleBarStyle::NORMAL;
// The "visualEffectState" option.
VisualEffectState visual_effect_state_ = VisualEffectState::FOLLOW_WINDOW;
// The visibility mode of window button controls when explicitly set through
// setWindowButtonVisibility().
base::Optional<bool> window_button_visibility_;

32
shell/browser/native_window_mac.mm
View file

@ -274,6 +274,28 @@ struct Converter<electron::NativeWindowMac::TitleBarStyle> {
}
};
template <>
struct Converter<electron::NativeWindowMac::VisualEffectState> {
static bool FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val,
electron::NativeWindowMac::VisualEffectState* out) {
using VisualEffectState = electron::NativeWindowMac::VisualEffectState;
std::string visual_effect_state;
if (!ConvertFromV8(isolate, val, &visual_effect_state))
return false;
if (visual_effect_state == "followWindow") {
*out = VisualEffectState::FOLLOW_WINDOW;
} else if (visual_effect_state == "active") {
*out = VisualEffectState::ACTIVE;
} else if (visual_effect_state == "inactive") {
*out = VisualEffectState::INACTIVE;
} else {
return false;
}
return true;
}
};
} // namespace gin
namespace electron {
@ -344,6 +366,7 @@ NativeWindowMac::NativeWindowMac(const gin_helper::Dictionary& options,
options.Get(options::kFullscreenWindowTitle, &fullscreen_window_title_);
options.Get(options::kSimpleFullScreen, &always_simple_fullscreen_);
options.Get(options::kTrafficLightPosition, &traffic_light_position_);
options.Get(options::kVisualEffectState, &visual_effect_state_);
bool minimizable = true;
options.Get(options::kMinimizable, &minimizable);
@ -1467,7 +1490,14 @@ void NativeWindowMac::SetVibrancy(const std::string& type) {
[effect_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[effect_view setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
[effect_view setState:NSVisualEffectStateFollowsWindowActiveState];
if (visual_effect_state_ == VisualEffectState::ACTIVE) {
[effect_view setState:NSVisualEffectStateActive];
} else if (visual_effect_state_ == VisualEffectState::INACTIVE) {
[effect_view setState:NSVisualEffectStateInactive];
} else {
[effect_view setState:NSVisualEffectStateFollowsWindowActiveState];
}
// Make frameless Vibrant windows have rounded corners.
if (!has_frame() && !is_modal()) {