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>
134 lines
4.3 KiB
C++
134 lines
4.3 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/views/frameless_view.h"
|
|
|
|
#include "shell/browser/native_browser_view_views.h"
|
|
#include "shell/browser/native_window_views.h"
|
|
#include "ui/aura/window.h"
|
|
#include "ui/base/hit_test.h"
|
|
#include "ui/views/widget/widget.h"
|
|
#include "ui/views/widget/widget_delegate.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
const int kResizeInsideBoundsSize = 5;
|
|
const int kResizeAreaCornerSize = 16;
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
const char FramelessView::kViewClassName[] = "FramelessView";
|
|
|
|
FramelessView::FramelessView() = default;
|
|
|
|
FramelessView::~FramelessView() = default;
|
|
|
|
void FramelessView::Init(NativeWindowViews* window, views::Widget* frame) {
|
|
window_ = window;
|
|
frame_ = frame;
|
|
}
|
|
|
|
int FramelessView::ResizingBorderHitTest(const gfx::Point& point) {
|
|
// Check the frame first, as we allow a small area overlapping the contents
|
|
// to be used for resize handles.
|
|
bool can_ever_resize = frame_->widget_delegate()
|
|
? frame_->widget_delegate()->CanResize()
|
|
: false;
|
|
|
|
// https://github.com/electron/electron/issues/611
|
|
// If window isn't resizable, we should always return HTCLIENT, otherwise the
|
|
// hover state of DOM will not be cleared probably.
|
|
if (!can_ever_resize)
|
|
return HTCLIENT;
|
|
|
|
// Don't allow overlapping resize handles when the window is maximized or
|
|
// fullscreen, as it can't be resized in those states.
|
|
int resize_border = frame_->IsMaximized() || frame_->IsFullscreen()
|
|
? 0
|
|
: kResizeInsideBoundsSize;
|
|
return GetHTComponentForFrame(point, gfx::Insets(resize_border),
|
|
kResizeAreaCornerSize, kResizeAreaCornerSize,
|
|
can_ever_resize);
|
|
}
|
|
|
|
gfx::Rect FramelessView::GetBoundsForClientView() const {
|
|
return bounds();
|
|
}
|
|
|
|
gfx::Rect FramelessView::GetWindowBoundsForClientBounds(
|
|
const gfx::Rect& client_bounds) const {
|
|
gfx::Rect window_bounds = client_bounds;
|
|
// Enforce minimum size (1, 1) in case that client_bounds is passed with
|
|
// empty size. This could occur when the frameless window is being
|
|
// initialized.
|
|
if (window_bounds.IsEmpty()) {
|
|
window_bounds.set_width(1);
|
|
window_bounds.set_height(1);
|
|
}
|
|
return window_bounds;
|
|
}
|
|
|
|
int FramelessView::NonClientHitTest(const gfx::Point& cursor) {
|
|
if (frame_->IsFullscreen())
|
|
return HTCLIENT;
|
|
|
|
// Check attached BrowserViews for potential draggable areas.
|
|
for (auto* view : window_->browser_views()) {
|
|
auto* native_view = static_cast<NativeBrowserViewViews*>(view);
|
|
auto* view_draggable_region = native_view->draggable_region();
|
|
if (view_draggable_region &&
|
|
view_draggable_region->contains(cursor.x(), cursor.y()))
|
|
return HTCAPTION;
|
|
}
|
|
|
|
// Support resizing frameless window by dragging the border.
|
|
int frame_component = ResizingBorderHitTest(cursor);
|
|
if (frame_component != HTNOWHERE)
|
|
return frame_component;
|
|
|
|
// Check for possible draggable region in the client area for the frameless
|
|
// window.
|
|
SkRegion* draggable_region = window_->draggable_region();
|
|
if (draggable_region && draggable_region->contains(cursor.x(), cursor.y()))
|
|
return HTCAPTION;
|
|
|
|
return HTCLIENT;
|
|
}
|
|
|
|
void FramelessView::GetWindowMask(const gfx::Size& size, SkPath* window_mask) {}
|
|
|
|
void FramelessView::ResetWindowControls() {}
|
|
|
|
void FramelessView::UpdateWindowIcon() {}
|
|
|
|
void FramelessView::UpdateWindowTitle() {}
|
|
|
|
void FramelessView::SizeConstraintsChanged() {}
|
|
|
|
gfx::Size FramelessView::CalculatePreferredSize() const {
|
|
return frame_->non_client_view()
|
|
->GetWindowBoundsForClientBounds(
|
|
gfx::Rect(frame_->client_view()->GetPreferredSize()))
|
|
.size();
|
|
}
|
|
|
|
gfx::Size FramelessView::GetMinimumSize() const {
|
|
return window_->GetContentMinimumSize();
|
|
}
|
|
|
|
gfx::Size FramelessView::GetMaximumSize() const {
|
|
gfx::Size size = window_->GetContentMaximumSize();
|
|
// Electron public APIs returns (0, 0) when maximum size is not set, but it
|
|
// would break internal window APIs like HWNDMessageHandler::SetAspectRatio.
|
|
return size.IsEmpty() ? gfx::Size(INT_MAX, INT_MAX) : size;
|
|
}
|
|
|
|
const char* FramelessView::GetClassName() const {
|
|
return kViewClassName;
|
|
}
|
|
|
|
} // namespace electron
|