8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6
* 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process
https://chromium-review.googlesource.com/c/chromium/src/+/2887336
* refactor: base::Optional -> absl::optional
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4514.0
* 2899417: Make build work when enable_pdf is set to false.
https://chromium-review.googlesource.com/c/chromium/src/+/2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager
https://chromium-review.googlesource.com/c/chromium/src/+/2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true
https://chromium-review.googlesource.com/c/chromium/src/+/2295749
* 2893803: Add a GetWebView to RenderFrame.
https://chromium-review.googlesource.com/c/chromium/src/+/2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost
https://chromium-review.googlesource.com/c/chromium/src/+/2892345
* chore: fixup patch indices
* 2892048: Real instance methods for BrowserContext: remaining 5 methods.
https://chromium-review.googlesource.com/c/chromium/src/+/2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces
https://chromium-review.googlesource.com/c/chromium/src/+/2902821
* 2496500: Remove last deprecated extension Event ctor.
https://chromium-review.googlesource.com/c/chromium/src/+/2496500
* chore: fixup malformed pepper support patch
* chore: bump chromium in DEPS to 92.0.4515.0
* 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.
https://chromium-review.googlesource.com/c/chromium/src/+/2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource
https://chromium-review.googlesource.com/c/chromium/src/+/2880838
* chore: fixup patch indices
* chore: bump chromium in DEPS to 92.0.4515.5
* chore: update patches
* chore: bump chromium in DEPS to 92.0.4515.7
* chore: bump chromium in DEPS to 92.0.4515.9
* chore: bump chromium in DEPS to 93.0.4522.0
* chore: bump chromium in DEPS to 93.0.4523.0
* chore: bump chromium in DEPS to 93.0.4524.0
* chore: update patches
* chore: enable_pak_file_integrity_checks was reverted
* chore: update patches
* refactor: base/optional was replaced with absl::optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::nullopt with absl::nullopt
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace all usages of base::make_optional with
absl::make_optional
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213
* chore: clean up left over opening namespace
Refs: 95bfe6d08f
* chore: add missing base::Contains include
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker
GetCurrentDisplay
This code looks suspicious but if the iterator was invalid before it
will also be invalid now.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191
* refactor: headers are now passed directly in extensions client
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906
* refactor: base::DictionaryValue::empty() has been removed
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424
* chore: add missing includes for network URLLoaderFactory
Refs: unknown, probably a side effect of header changes
* refactor: make convenience wrapper around AppendArg
There is no converter FromV8 for base::StringPiece (apparently its not
possible). So we now take in an std::string and use the construct for
StringPiece to do implicit conversion.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544
* chore: add patch
* chore: bump chromium in DEPS to 93.0.4525.0
* chore: update patches
* refactor: CanResize has been de-virtualized
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774
* chore: update resource integrity patch
* chore: add character encoding idl patch
* chore: bump chromium in DEPS to 93.0.4526.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4527.0
* chore: bump chromium in DEPS to 93.0.4528.0
* chore: update patches
* chore: update idl encoding patch
* chore: bump chromium in DEPS to 93.0.4529.0
* chore: update patches
* chore: bump chromium in DEPS to 93.0.4530.0
* chore: update patches
* fix: only SetCanResize after the widget has been initialized
* chore: add patch for vr on windows gn gen
* spec: fix focus related tests on linux due to delay in focus swap
* chore: remove new usages of base::Optional from main
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
119 lines
3.2 KiB
Text
119 lines
3.2 KiB
Text
// Copyright (c) 2021 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/cocoa/window_buttons_view.h"
|
|
|
|
#include "base/i18n/rtl.h"
|
|
#include "base/logging.h"
|
|
#include "base/stl_util.h"
|
|
#include "ui/gfx/mac/coordinate_conversion.h"
|
|
|
|
namespace {
|
|
|
|
const CGFloat kButtonPadding = 20.;
|
|
|
|
const NSWindowButton kButtonTypes[] = {
|
|
NSWindowCloseButton,
|
|
NSWindowMiniaturizeButton,
|
|
NSWindowZoomButton,
|
|
};
|
|
|
|
} // namespace
|
|
|
|
@implementation WindowButtonsView
|
|
|
|
- (id)initWithMargin:(const absl::optional<gfx::Point>&)margin {
|
|
self = [super initWithFrame:NSZeroRect];
|
|
[self setMargin:margin];
|
|
|
|
mouse_inside_ = false;
|
|
show_on_hover_ = false;
|
|
is_rtl_ = base::i18n::IsRTL();
|
|
|
|
for (size_t i = 0; i < base::size(kButtonTypes); ++i) {
|
|
NSButton* button = [NSWindow standardWindowButton:kButtonTypes[i]
|
|
forStyleMask:NSWindowStyleMaskTitled];
|
|
[button setTag:i];
|
|
int left_index = is_rtl_ ? base::size(kButtonTypes) - i - 1 : i;
|
|
[button setFrameOrigin:NSMakePoint(left_index * kButtonPadding, 0)];
|
|
[self addSubview:button];
|
|
}
|
|
|
|
NSView* last_button =
|
|
is_rtl_ ? [[self subviews] firstObject] : [[self subviews] lastObject];
|
|
[self setFrameSize:NSMakeSize(last_button.frame.origin.x +
|
|
last_button.frame.size.width,
|
|
last_button.frame.size.height)];
|
|
[self setNeedsDisplayForButtons];
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)setMargin:(const absl::optional<gfx::Point>&)margin {
|
|
margin_ = margin.value_or(gfx::Point(7, 3));
|
|
}
|
|
|
|
- (void)setShowOnHover:(BOOL)yes {
|
|
show_on_hover_ = yes;
|
|
[self setNeedsDisplayForButtons];
|
|
}
|
|
|
|
- (void)setNeedsDisplayForButtons {
|
|
for (NSView* subview in self.subviews) {
|
|
[subview setHidden:(show_on_hover_ && !mouse_inside_)];
|
|
[subview setNeedsDisplay:YES];
|
|
}
|
|
}
|
|
|
|
- (void)removeFromSuperview {
|
|
[super removeFromSuperview];
|
|
mouse_inside_ = NO;
|
|
}
|
|
|
|
- (void)viewDidMoveToWindow {
|
|
// Stay in upper left corner.
|
|
CGFloat y =
|
|
self.superview.frame.size.height - self.frame.size.height - margin_.y();
|
|
if (is_rtl_) {
|
|
CGFloat x =
|
|
self.superview.frame.size.width - self.frame.size.width - margin_.x();
|
|
[self setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
|
|
[self setFrameOrigin:NSMakePoint(x, y)];
|
|
} else {
|
|
[self setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
|
|
[self setFrameOrigin:NSMakePoint(margin_.x(), y)];
|
|
}
|
|
}
|
|
|
|
- (BOOL)_mouseInGroup:(NSButton*)button {
|
|
return mouse_inside_;
|
|
}
|
|
|
|
- (void)updateTrackingAreas {
|
|
[super updateTrackingAreas];
|
|
if (tracking_area_)
|
|
[self removeTrackingArea:tracking_area_.get()];
|
|
|
|
tracking_area_.reset([[NSTrackingArea alloc]
|
|
initWithRect:NSZeroRect
|
|
options:NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways |
|
|
NSTrackingInVisibleRect
|
|
owner:self
|
|
userInfo:nil]);
|
|
[self addTrackingArea:tracking_area_.get()];
|
|
}
|
|
|
|
- (void)mouseEntered:(NSEvent*)event {
|
|
[super mouseEntered:event];
|
|
mouse_inside_ = YES;
|
|
[self setNeedsDisplayForButtons];
|
|
}
|
|
|
|
- (void)mouseExited:(NSEvent*)event {
|
|
[super mouseExited:event];
|
|
mouse_inside_ = NO;
|
|
[self setNeedsDisplayForButtons];
|
|
}
|
|
|
|
@end
|