41646d1168
* rebase "feat: enable windows control overlay on Windows" * correct compilation error * fix linting errors * modify includes and build file * change `hidden` option to `overlay` * add patch to fix visual layout * add button background color parameter * add button text color parameter * modify `overlay` in docs and modify button hover/press transition color * change `text` to `symbol` * remove todo and fix `text` replacement * add new titleBarOverlay property and remove titleBarStyle `overlay` * update browser and frameless window docs * remove chromium patches * chore: update patches * change button hover color, update trailing `_`, update test file * add dchecks, update title bar drawing checks, update test file * modify for mac and linux builds * update docs with overlayColor and overlaySymbolColor * add corner and side hit test info * modify docs and copyright info * modify `titlebar_overlay_` as boolean or object * move `title_bar_style_ to `NativeWindow` * update docs with boolean and object titlebar_overlay_ * add `IsEmpty` checks * move get options for boolean and object checks * fix linting error * disable `use_lld` for macos * Update docs/api/frameless-window.md Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Update docs/api/frameless-window.md Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Update docs/api/frameless-window.md Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * Apply docs suggestions from code review Co-authored-by: Jeremy Rose <jeremya@chromium.org> * modify `true` option description `titleBarOverlay` * ci: cleanup keychain after tests on arm64 mac (#30472) Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
220 lines
7.4 KiB
C++
220 lines
7.4 KiB
C++
// Copyright (c) 2016 The Chromium 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 "shell/browser/ui/views/win_caption_button.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "base/i18n/rtl.h"
|
|
#include "base/numerics/safe_conversions.h"
|
|
#include "chrome/browser/ui/frame/window_frame_util.h"
|
|
#include "chrome/grit/theme_resources.h"
|
|
#include "shell/browser/ui/views/win_frame_view.h"
|
|
#include "shell/common/color_util.h"
|
|
#include "ui/base/metadata/metadata_impl_macros.h"
|
|
#include "ui/base/theme_provider.h"
|
|
#include "ui/gfx/animation/tween.h"
|
|
#include "ui/gfx/color_utils.h"
|
|
#include "ui/gfx/geometry/rect_conversions.h"
|
|
#include "ui/gfx/scoped_canvas.h"
|
|
|
|
namespace electron {
|
|
|
|
WinCaptionButton::WinCaptionButton(PressedCallback callback,
|
|
WinFrameView* frame_view,
|
|
ViewID button_type,
|
|
const std::u16string& accessible_name)
|
|
: views::Button(std::move(callback)),
|
|
frame_view_(frame_view),
|
|
button_type_(button_type) {
|
|
SetAnimateOnStateChange(true);
|
|
// Not focusable by default, only for accessibility.
|
|
SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
|
|
SetAccessibleName(accessible_name);
|
|
}
|
|
|
|
gfx::Size WinCaptionButton::CalculatePreferredSize() const {
|
|
// TODO(bsep): The sizes in this function are for 1x device scale and don't
|
|
// match Windows button sizes at hidpi.
|
|
int height = WindowFrameUtil::kWindows10GlassCaptionButtonHeightRestored;
|
|
int base_width = WindowFrameUtil::kWindows10GlassCaptionButtonWidth;
|
|
return gfx::Size(base_width + GetBetweenButtonSpacing(), height);
|
|
}
|
|
|
|
void WinCaptionButton::OnPaintBackground(gfx::Canvas* canvas) {
|
|
// Paint the background of the button (the semi-transparent rectangle that
|
|
// appears when you hover or press the button).
|
|
|
|
const SkColor bg_color = frame_view_->window()->overlay_button_color();
|
|
const SkAlpha theme_alpha = SkColorGetA(bg_color);
|
|
|
|
gfx::Rect bounds = GetContentsBounds();
|
|
bounds.Inset(0, 0, 0, 0);
|
|
|
|
canvas->FillRect(bounds, SkColorSetA(bg_color, theme_alpha));
|
|
|
|
SkColor base_color;
|
|
SkAlpha hovered_alpha, pressed_alpha;
|
|
if (button_type_ == VIEW_ID_CLOSE_BUTTON) {
|
|
base_color = SkColorSetRGB(0xE8, 0x11, 0x23);
|
|
hovered_alpha = SK_AlphaOPAQUE;
|
|
pressed_alpha = 0x98;
|
|
} else {
|
|
// Match the native buttons.
|
|
base_color = frame_view_->GetReadableFeatureColor(bg_color);
|
|
hovered_alpha = 0x1A;
|
|
pressed_alpha = 0x33;
|
|
|
|
if (theme_alpha > 0) {
|
|
// Theme buttons have slightly increased opacity to make them stand out
|
|
// against a visually-busy frame image.
|
|
constexpr float kAlphaScale = 1.3f;
|
|
hovered_alpha = base::ClampRound<SkAlpha>(hovered_alpha * kAlphaScale);
|
|
pressed_alpha = base::ClampRound<SkAlpha>(pressed_alpha * kAlphaScale);
|
|
}
|
|
}
|
|
|
|
SkAlpha alpha;
|
|
if (GetState() == STATE_PRESSED)
|
|
alpha = pressed_alpha;
|
|
else
|
|
alpha = gfx::Tween::IntValueBetween(hover_animation().GetCurrentValue(),
|
|
SK_AlphaTRANSPARENT, hovered_alpha);
|
|
canvas->FillRect(bounds, SkColorSetA(base_color, alpha));
|
|
}
|
|
|
|
void WinCaptionButton::PaintButtonContents(gfx::Canvas* canvas) {
|
|
PaintSymbol(canvas);
|
|
}
|
|
|
|
int WinCaptionButton::GetBetweenButtonSpacing() const {
|
|
const int display_order_index = GetButtonDisplayOrderIndex();
|
|
return display_order_index == 0
|
|
? 0
|
|
: WindowFrameUtil::kWindows10GlassCaptionButtonVisualSpacing;
|
|
}
|
|
|
|
int WinCaptionButton::GetButtonDisplayOrderIndex() const {
|
|
int button_display_order = 0;
|
|
switch (button_type_) {
|
|
case VIEW_ID_MINIMIZE_BUTTON:
|
|
button_display_order = 0;
|
|
break;
|
|
case VIEW_ID_MAXIMIZE_BUTTON:
|
|
case VIEW_ID_RESTORE_BUTTON:
|
|
button_display_order = 1;
|
|
break;
|
|
case VIEW_ID_CLOSE_BUTTON:
|
|
button_display_order = 2;
|
|
break;
|
|
default:
|
|
NOTREACHED();
|
|
return 0;
|
|
}
|
|
|
|
// Reverse the ordering if we're in RTL mode
|
|
if (base::i18n::IsRTL())
|
|
button_display_order = 2 - button_display_order;
|
|
|
|
return button_display_order;
|
|
}
|
|
|
|
namespace {
|
|
|
|
// Canvas::DrawRect's stroke can bleed out of |rect|'s bounds, so this draws a
|
|
// rectangle inset such that the result is constrained to |rect|'s size.
|
|
void DrawRect(gfx::Canvas* canvas,
|
|
const gfx::Rect& rect,
|
|
const cc::PaintFlags& flags) {
|
|
gfx::RectF rect_f(rect);
|
|
float stroke_half_width = flags.getStrokeWidth() / 2;
|
|
rect_f.Inset(stroke_half_width, stroke_half_width);
|
|
canvas->DrawRect(rect_f, flags);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void WinCaptionButton::PaintSymbol(gfx::Canvas* canvas) {
|
|
SkColor symbol_color = frame_view_->window()->overlay_symbol_color();
|
|
|
|
if (button_type_ == VIEW_ID_CLOSE_BUTTON &&
|
|
hover_animation().is_animating()) {
|
|
symbol_color = gfx::Tween::ColorValueBetween(
|
|
hover_animation().GetCurrentValue(), symbol_color, SK_ColorWHITE);
|
|
} else if (button_type_ == VIEW_ID_CLOSE_BUTTON &&
|
|
(GetState() == STATE_HOVERED || GetState() == STATE_PRESSED)) {
|
|
symbol_color = SK_ColorWHITE;
|
|
}
|
|
|
|
gfx::ScopedCanvas scoped_canvas(canvas);
|
|
const float scale = canvas->UndoDeviceScaleFactor();
|
|
|
|
const int symbol_size_pixels = std::round(10 * scale);
|
|
gfx::RectF bounds_rect(GetContentsBounds());
|
|
bounds_rect.Scale(scale);
|
|
gfx::Rect symbol_rect(gfx::ToEnclosingRect(bounds_rect));
|
|
symbol_rect.ClampToCenteredSize(
|
|
gfx::Size(symbol_size_pixels, symbol_size_pixels));
|
|
|
|
cc::PaintFlags flags;
|
|
flags.setAntiAlias(false);
|
|
flags.setColor(symbol_color);
|
|
flags.setStyle(cc::PaintFlags::kStroke_Style);
|
|
// Stroke width jumps up a pixel every time we reach a new integral scale.
|
|
const int stroke_width = std::floor(scale);
|
|
flags.setStrokeWidth(stroke_width);
|
|
|
|
switch (button_type_) {
|
|
case VIEW_ID_MINIMIZE_BUTTON: {
|
|
const int y = symbol_rect.CenterPoint().y();
|
|
const gfx::Point p1 = gfx::Point(symbol_rect.x(), y);
|
|
const gfx::Point p2 = gfx::Point(symbol_rect.right(), y);
|
|
canvas->DrawLine(p1, p2, flags);
|
|
return;
|
|
}
|
|
|
|
case VIEW_ID_MAXIMIZE_BUTTON:
|
|
DrawRect(canvas, symbol_rect, flags);
|
|
return;
|
|
|
|
case VIEW_ID_RESTORE_BUTTON: {
|
|
// Bottom left ("in front") square.
|
|
const int separation = std::floor(2 * scale);
|
|
symbol_rect.Inset(0, separation, separation, 0);
|
|
DrawRect(canvas, symbol_rect, flags);
|
|
|
|
// Top right ("behind") square.
|
|
canvas->ClipRect(symbol_rect, SkClipOp::kDifference);
|
|
symbol_rect.Offset(separation, -separation);
|
|
DrawRect(canvas, symbol_rect, flags);
|
|
return;
|
|
}
|
|
|
|
case VIEW_ID_CLOSE_BUTTON: {
|
|
flags.setAntiAlias(true);
|
|
// The close button's X is surrounded by a "halo" of transparent pixels.
|
|
// When the X is white, the transparent pixels need to be a bit brighter
|
|
// to be visible.
|
|
const float stroke_halo =
|
|
stroke_width * (symbol_color == SK_ColorWHITE ? 0.1f : 0.05f);
|
|
flags.setStrokeWidth(stroke_width + stroke_halo);
|
|
|
|
// TODO(bsep): This sometimes draws misaligned at fractional device scales
|
|
// because the button's origin isn't necessarily aligned to pixels.
|
|
canvas->ClipRect(symbol_rect);
|
|
SkPath path;
|
|
path.moveTo(symbol_rect.x(), symbol_rect.y());
|
|
path.lineTo(symbol_rect.right(), symbol_rect.bottom());
|
|
path.moveTo(symbol_rect.right(), symbol_rect.y());
|
|
path.lineTo(symbol_rect.x(), symbol_rect.bottom());
|
|
canvas->DrawPath(path, flags);
|
|
return;
|
|
}
|
|
|
|
default:
|
|
NOTREACHED();
|
|
return;
|
|
}
|
|
}
|
|
} // namespace electron
|