5c7579ab1c
* chore: bump chromium in DEPS to 121.0.6128.0 * build: update patches * refactor: remove instrumentation from extensions code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5002404 * refactor: modernization of tabs_api Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4997031 * fix: add RecordHover and RecordDrag handlers * build: add missing pdf files * chore: bump chromium in DEPS to 121.0.6129.0 * chore: bump chromium in DEPS to 121.0.6131.0 * chore: update patches * refactor: remove will_cause_resize from ExitFullscreen Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5031312 * chore: add missing std converter include Before these were being inferred as std::string implicitly, not anymore Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5029573 * chore: Unwrap UserScriptList from unique_ptrs Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5005198 * refactor: add PDF internal id into PDF stream info Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4876972 * refactor: add metadata to view classes Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4994885 * chore: run lint --fix * chore: update libc++ filenames * chore: clean up menubar * chore: update patches after main merge * 5010979: Replace base::WStringPiece usage with std::wstring_view | https://chromium-review.googlesource.com/c/chromium/src/+/5010979 * chore: bump chromium in DEPS to 121.0.6142.0 * chore: update patches * 4969574: Refactor NativeDesktopMediaList | https://chromium-review.googlesource.com/c/chromium/src/+/4969574 * 5031192: [blink] Create new blink test suite that doesn't create blink Isolate | https://chromium-review.googlesource.com/c/chromium/src/+/5031192 * chore: update v8/devtools patches * 5040722: [base] Replace MakeFixedFlatTreeSorted with tag type overloads | https://chromium-review.googlesource.com/c/chromium/src/+/5040722 * 5026474: Add --generate-pdf-document-outline | https://chromium-review.googlesource.com/c/chromium/src/+/5026474 * 5024297: Change parameter of CheckMediaAccessPermission from GURL to URL::Origin | https://chromium-review.googlesource.com/c/chromium/src/+/5024297 * 5034217: [RWS] Remove CanonicalCookie::IsSameParty method | https://chromium-review.googlesource.com/c/chromium/src/+/5034217 * 5037192: Rewrite usage of RenderFrame::GetRoutingID | https://chromium-review.googlesource.com/c/chromium/src/+/5037192 * 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * chore: bump chromium in DEPS to 121.0.6143.0 * chore: bump chromium in DEPS to 121.0.6145.0 * chore: update chromium patches * 5049986: Use std::unique_ptr for MenuItemView::submenu_ member. | https://chromium-review.googlesource.com/c/chromium/src/+/5049986 * 5041595: picture-in-picture: Add PictureInPictureOcclusionTracker | https://chromium-review.googlesource.com/c/chromium/src/+/5041595 * chore: update all patches * chore: bump chromium in DEPS to 121.0.6147.0 * chore: update patches * 5051069: Use base::FunctionRef for BrowserPluginGuestManager. | https://chromium-review.googlesource.com/c/chromium/src/+/5051069 * 5057330: [base] Remove base::Erase()/base::EraseIf() overloads for std::set | https://chromium-review.googlesource.com/c/chromium/src/+/5057330 * fixup! 5041802: Reland "Incorporate policy override for OOPPD feature" | https://chromium-review.googlesource.com/c/chromium/src/+/5041802 * 5017518: Remove PPAPI if NaCl is disabled | https://chromium-review.googlesource.com/c/chromium/src/+/5017518 * 5002232: [DevTools] Console Insights: move from build flag to Feature API | https://chromium-review.googlesource.com/c/chromium/src/+/5002232 * 4970322: [X11] Move utils into x11::Connection | https://chromium-review.googlesource.com/c/chromium/src/+/4970322 * 5048950: Let MenuModelAdapter::CreateMenu return a std::unique_ptr<>. | https://chromium-review.googlesource.com/c/chromium/src/+/5048950 * chore: update libcxx filenames * use Context::Scope in RunScriptsAtDocument{Start,End} * 4775128: content: Reuse CC instance for main frame navigations https://chromium-review.googlesource.com/c/chromium/src/+/4775128 * also wrap WebWorkerObserver::ContextWillDestroy with Context::Scope * set LIBCPP_HARDENING_MODE https://chromium-review.googlesource.com/c/chromium/src/+/5014271 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
195 lines
6.9 KiB
C++
195 lines
6.9 KiB
C++
// Copyright 2020 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.
|
|
|
|
// Modified from
|
|
// chrome/browser/ui/views/frame/glass_browser_caption_button_container.cc
|
|
|
|
#include "shell/browser/ui/views/win_caption_button_container.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "shell/browser/ui/views/win_caption_button.h"
|
|
#include "shell/browser/ui/views/win_frame_view.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
#include "ui/compositor/layer.h"
|
|
#include "ui/strings/grit/ui_strings.h"
|
|
#include "ui/views/background.h"
|
|
#include "ui/views/layout/flex_layout.h"
|
|
#include "ui/views/view_class_properties.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
std::unique_ptr<WinCaptionButton> CreateCaptionButton(
|
|
views::Button::PressedCallback callback,
|
|
WinFrameView* frame_view,
|
|
ViewID button_type,
|
|
int accessible_name_resource_id) {
|
|
return std::make_unique<WinCaptionButton>(
|
|
std::move(callback), frame_view, button_type,
|
|
l10n_util::GetStringUTF16(accessible_name_resource_id));
|
|
}
|
|
|
|
bool HitTestCaptionButton(WinCaptionButton* button, const gfx::Point& point) {
|
|
return button && button->GetVisible() && button->bounds().Contains(point);
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
WinCaptionButtonContainer::WinCaptionButtonContainer(WinFrameView* frame_view)
|
|
: frame_view_(frame_view),
|
|
minimize_button_(AddChildView(CreateCaptionButton(
|
|
base::BindRepeating(&views::Widget::Minimize,
|
|
base::Unretained(frame_view_->frame())),
|
|
frame_view_,
|
|
VIEW_ID_MINIMIZE_BUTTON,
|
|
IDS_APP_ACCNAME_MINIMIZE))),
|
|
maximize_button_(AddChildView(CreateCaptionButton(
|
|
base::BindRepeating(&views::Widget::Maximize,
|
|
base::Unretained(frame_view_->frame())),
|
|
frame_view_,
|
|
VIEW_ID_MAXIMIZE_BUTTON,
|
|
IDS_APP_ACCNAME_MAXIMIZE))),
|
|
restore_button_(AddChildView(CreateCaptionButton(
|
|
base::BindRepeating(&views::Widget::Restore,
|
|
base::Unretained(frame_view_->frame())),
|
|
frame_view_,
|
|
VIEW_ID_RESTORE_BUTTON,
|
|
IDS_APP_ACCNAME_RESTORE))),
|
|
close_button_(AddChildView(CreateCaptionButton(
|
|
base::BindRepeating(&views::Widget::CloseWithReason,
|
|
base::Unretained(frame_view_->frame()),
|
|
views::Widget::ClosedReason::kCloseButtonClicked),
|
|
frame_view_,
|
|
VIEW_ID_CLOSE_BUTTON,
|
|
IDS_APP_ACCNAME_CLOSE))) {
|
|
// Layout is horizontal, with buttons placed at the trailing end of the view.
|
|
// This allows the container to expand to become a faux titlebar/drag handle.
|
|
auto* const layout = SetLayoutManager(std::make_unique<views::FlexLayout>());
|
|
layout->SetOrientation(views::LayoutOrientation::kHorizontal)
|
|
.SetMainAxisAlignment(views::LayoutAlignment::kEnd)
|
|
.SetCrossAxisAlignment(views::LayoutAlignment::kStart)
|
|
.SetDefault(
|
|
views::kFlexBehaviorKey,
|
|
views::FlexSpecification(views::LayoutOrientation::kHorizontal,
|
|
views::MinimumFlexSizeRule::kPreferred,
|
|
views::MaximumFlexSizeRule::kPreferred,
|
|
/* adjust_width_for_height */ false,
|
|
views::MinimumFlexSizeRule::kScaleToZero));
|
|
}
|
|
|
|
WinCaptionButtonContainer::~WinCaptionButtonContainer() {}
|
|
|
|
int WinCaptionButtonContainer::NonClientHitTest(const gfx::Point& point) const {
|
|
DCHECK(HitTestPoint(point))
|
|
<< "should only be called with a point inside this view's bounds";
|
|
if (HitTestCaptionButton(minimize_button_, point)) {
|
|
return HTMINBUTTON;
|
|
}
|
|
if (HitTestCaptionButton(maximize_button_, point)) {
|
|
return HTMAXBUTTON;
|
|
}
|
|
if (HitTestCaptionButton(restore_button_, point)) {
|
|
return HTMAXBUTTON;
|
|
}
|
|
if (HitTestCaptionButton(close_button_, point)) {
|
|
return HTCLOSE;
|
|
}
|
|
return HTCAPTION;
|
|
}
|
|
|
|
gfx::Size WinCaptionButtonContainer::GetButtonSize() const {
|
|
// Close button size is set the same as all the buttons
|
|
return close_button_->GetSize();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::SetButtonSize(gfx::Size size) {
|
|
minimize_button_->SetSize(size);
|
|
maximize_button_->SetSize(size);
|
|
restore_button_->SetSize(size);
|
|
close_button_->SetSize(size);
|
|
}
|
|
|
|
void WinCaptionButtonContainer::ResetWindowControls() {
|
|
minimize_button_->SetState(views::Button::STATE_NORMAL);
|
|
maximize_button_->SetState(views::Button::STATE_NORMAL);
|
|
restore_button_->SetState(views::Button::STATE_NORMAL);
|
|
close_button_->SetState(views::Button::STATE_NORMAL);
|
|
InvalidateLayout();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::AddedToWidget() {
|
|
views::Widget* const widget = GetWidget();
|
|
|
|
DCHECK(!widget_observation_.IsObserving());
|
|
widget_observation_.Observe(widget);
|
|
|
|
UpdateButtons();
|
|
|
|
if (frame_view_->window()->IsWindowControlsOverlayEnabled()) {
|
|
UpdateBackground();
|
|
}
|
|
}
|
|
|
|
void WinCaptionButtonContainer::RemovedFromWidget() {
|
|
DCHECK(widget_observation_.IsObserving());
|
|
widget_observation_.Reset();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::OnWidgetBoundsChanged(
|
|
views::Widget* widget,
|
|
const gfx::Rect& new_bounds) {
|
|
UpdateButtons();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::UpdateBackground() {
|
|
const SkColor bg_color = frame_view_->window()->overlay_button_color();
|
|
const SkAlpha theme_alpha = SkColorGetA(bg_color);
|
|
SetBackground(views::CreateSolidBackground(bg_color));
|
|
SetPaintToLayer();
|
|
|
|
if (theme_alpha < SK_AlphaOPAQUE)
|
|
layer()->SetFillsBoundsOpaquely(false);
|
|
}
|
|
|
|
void WinCaptionButtonContainer::UpdateButtons() {
|
|
const bool is_maximized = frame_view_->frame()->IsMaximized();
|
|
restore_button_->SetVisible(is_maximized);
|
|
maximize_button_->SetVisible(!is_maximized);
|
|
|
|
const bool minimizable = frame_view_->window()->IsMinimizable();
|
|
minimize_button_->SetEnabled(minimizable);
|
|
minimize_button_->SetVisible(minimizable);
|
|
|
|
// In touch mode, windows cannot be taken out of fullscreen or tiled mode, so
|
|
// the maximize/restore button should be disabled.
|
|
const bool is_touch = ui::TouchUiController::Get()->touch_ui();
|
|
restore_button_->SetEnabled(!is_touch);
|
|
|
|
// In touch mode, windows cannot be taken out of fullscreen or tiled mode, so
|
|
// the maximize/restore button should be disabled, unless the window is not
|
|
// maximized.
|
|
const bool maximizable = frame_view_->window()->IsMaximizable();
|
|
maximize_button_->SetEnabled(!(is_touch && is_maximized) && maximizable);
|
|
|
|
const bool closable = frame_view_->window()->IsClosable();
|
|
close_button_->SetEnabled(closable);
|
|
|
|
// If all three of closable, maximizable, and minimizable are disabled,
|
|
// Windows natively only shows the disabled closable button. Copy that
|
|
// behavior here.
|
|
if (!maximizable && !closable && !minimizable) {
|
|
minimize_button_->SetVisible(false);
|
|
maximize_button_->SetVisible(false);
|
|
}
|
|
|
|
InvalidateLayout();
|
|
}
|
|
|
|
BEGIN_METADATA(WinCaptionButtonContainer)
|
|
END_METADATA
|
|
|
|
} // namespace electron
|