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>
143 lines
5.2 KiB
C++
143 lines
5.2 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.
|
|
|
|
#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/strings/grit/ui_strings.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;
|
|
}
|
|
|
|
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()) {
|
|
SetPaintToLayer();
|
|
}
|
|
}
|
|
|
|
void WinCaptionButtonContainer::RemovedFromWidget() {
|
|
DCHECK(widget_observation_.IsObserving());
|
|
widget_observation_.Reset();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::OnWidgetBoundsChanged(
|
|
views::Widget* widget,
|
|
const gfx::Rect& new_bounds) {
|
|
UpdateButtons();
|
|
}
|
|
|
|
void WinCaptionButtonContainer::UpdateButtons() {
|
|
const bool is_maximized = frame_view_->frame()->IsMaximized();
|
|
restore_button_->SetVisible(is_maximized);
|
|
maximize_button_->SetVisible(!is_maximized);
|
|
|
|
// 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);
|
|
maximize_button_->SetEnabled(!is_touch);
|
|
InvalidateLayout();
|
|
}
|
|
} // namespace electron
|