0dad99561b
* chore: bump chromium in DEPS to 123.0.6273.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6274.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6276.0 * chore: update patches * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * WIP: 5239586: Change View::Layout() to take a PassKey. https://chromium-review.googlesource.com/c/chromium/src/+/5239586 * chore: bump chromium in DEPS to 123.0.6278.0 * chore: bump chromium in DEPS to 123.0.6280.0 * chore: update patches * chore: use net::CanonicalCookie::SecureAttribute() renamed from IsSecure() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5245913 * refactor: handle multiple requested device ids Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5132210 * refactor: trigger View layouts async with View::InvalidateLayout() Upstream has introduced a PassKey to restrict who can call Layout() directly. I've opted for calling `InvalidateLayout()` which is the approach that upstream recommends. If for some reason this approach doesn't work for us, we could use `DeprecatedLayoutImmediately()` as a stopgap. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5239586 Xref: https://chromium.googlesource.com/chromium/src/+/main/ui/views/view.h#809 Xref: https://chromium.googlesource.com/chromium/src/+/main/docs/ui/learn/bestpractices/layout.md?pli=1#don_t-invoke-layout_directly * chore: bump chromium in DEPS to 123.0.6282.0 * chore: bump chromium in DEPS to 123.0.6284.0 * chore: update patches * refactor: remove use of blink::MainThreadIsolate() pt 1/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 2/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * refactor: remove use of blink::MainThreadIsolate() pt 3/3 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5249640 * chore: update enum name to ui::AXMode::kPDFPrinting Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5270301 * chore: rebuild filenames.libcxx.gni * chore: sync with upstream rename of PortProvider.TaskForHandle() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5259103 * chore: bump chromium in DEPS to 123.0.6286.0 * chore: bump chromium in DEPS to 123.0.6288.0 * WebPreferences: Initialize in declaration. Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5277099 * chore: update webview_fullscreen.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5053508 Simple update to fix patch shear * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5254861 Simple update to fix patch shear * chore: add IWC::Delegate::RecordResize() stub to fix FTBFS https://chromium-review.googlesource.com/c/chromium/src/+/5268963 * chore: add FormControlType::kButtonPopover to the FormControlType converter Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5230929 * chore: e patches all * chore: node script/gen-libc++-filenames.js * chore: bump chromium in DEPS to 123.0.6290.0 * chore: bump chromium in DEPS to 123.0.6291.0 * chore: bump chromium in DEPS to 123.0.6292.0 * chore: bump chromium in DEPS to 123.0.6294.0 * chore: update fix_aspect_ratio_with_max_size.patch Xref: fix_aspect_ratio_with_max_size.patch note: simple absl::optional -> std::optional conversion * chore: update feat_filter_out_non-shareable_windows_in_the_current_application_in.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5272337 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch No manual changes; just adjusting line patch offsets Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5258688 * chore: update feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5281322 * chore: update fix_select_The_first_menu_item_when_opened_via_keyboard.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5279376 note: simple absl::optional -> std::optional conversion * chore: update feat_allow_code_cache_in_custom_schemes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5268792 * chore: script/export_all_patches.py * chore: bump chromium in DEPS to 123.0.6296.0 * chore: update patches * fixup! chore: update feat_allow_code_cache_in_custom_schemes.patch * fix: restore MessagePort close event * spec: fix CORB testing Refs https://chromium-review.googlesource.com/c/chromium/src/+/5231506 * fix: use sync layout when content view changes * fixup! chore: update feat_configure_launch_options_for_service_process.patch * Add remote-cocoa support for context menus. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5259806 * Rename //net/base/mac directory to //net/base/apple (1/n) Refs https://chromium-review.googlesource.com/c/chromium/src/+/5211389 * fixup! Add remote-cocoa support for context menus. * [Clipboard] Don't add meta charset tag for async write() method on Mac. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5187335 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
151 lines
4.8 KiB
C++
151 lines
4.8 KiB
C++
// Copyright (c) 2021 Ryan Gonzalez.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef ELECTRON_SHELL_BROWSER_UI_VIEWS_CLIENT_FRAME_VIEW_LINUX_H_
|
|
#define ELECTRON_SHELL_BROWSER_UI_VIEWS_CLIENT_FRAME_VIEW_LINUX_H_
|
|
|
|
#include <array>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/raw_ptr_exclusion.h"
|
|
#include "base/scoped_observation.h"
|
|
#include "shell/browser/ui/views/frameless_view.h"
|
|
#include "ui/base/ui_base_types.h"
|
|
#include "ui/linux/linux_ui.h"
|
|
#include "ui/linux/nav_button_provider.h"
|
|
#include "ui/linux/window_button_order_observer.h"
|
|
#include "ui/linux/window_frame_provider.h"
|
|
#include "ui/native_theme/native_theme.h"
|
|
#include "ui/native_theme/native_theme_observer.h"
|
|
#include "ui/views/controls/button/image_button.h"
|
|
#include "ui/views/controls/label.h"
|
|
#include "ui/views/widget/widget.h"
|
|
#include "ui/views/window/frame_buttons.h"
|
|
|
|
namespace electron {
|
|
|
|
class ClientFrameViewLinux : public FramelessView,
|
|
public ui::NativeThemeObserver,
|
|
public ui::WindowButtonOrderObserver {
|
|
public:
|
|
static const char kViewClassName[];
|
|
ClientFrameViewLinux();
|
|
~ClientFrameViewLinux() override;
|
|
|
|
void Init(NativeWindowViews* window, views::Widget* frame) override;
|
|
|
|
// These are here for ElectronDesktopWindowTreeHostLinux to use.
|
|
gfx::Insets GetBorderDecorationInsets() const;
|
|
gfx::Insets GetInputInsets() const;
|
|
gfx::Rect GetWindowContentBounds() const;
|
|
SkRRect GetRoundedWindowContentBounds() const;
|
|
// Returns which edges of the frame are tiled.
|
|
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
|
|
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
|
|
tiled_edges_ = tiled_edges;
|
|
}
|
|
|
|
protected:
|
|
// ui::NativeThemeObserver:
|
|
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
|
|
|
|
// views::WindowButtonOrderObserver:
|
|
void OnWindowButtonOrderingChange() override;
|
|
|
|
// Overridden from FramelessView:
|
|
int ResizingBorderHitTest(const gfx::Point& point) override;
|
|
|
|
// Overridden from views::NonClientFrameView:
|
|
gfx::Rect GetBoundsForClientView() const override;
|
|
gfx::Rect GetWindowBoundsForClientBounds(
|
|
const gfx::Rect& client_bounds) const override;
|
|
int NonClientHitTest(const gfx::Point& point) override;
|
|
void GetWindowMask(const gfx::Size& size, SkPath* window_mask) override;
|
|
void UpdateWindowTitle() override;
|
|
void SizeConstraintsChanged() override;
|
|
|
|
// Overridden from View:
|
|
gfx::Size CalculatePreferredSize() const override;
|
|
gfx::Size GetMinimumSize() const override;
|
|
gfx::Size GetMaximumSize() const override;
|
|
void Layout(PassKey) override;
|
|
void OnPaint(gfx::Canvas* canvas) override;
|
|
const char* GetClassName() const override;
|
|
|
|
// Overriden from views::ViewTargeterDelegate
|
|
views::View* TargetForRect(views::View* root, const gfx::Rect& rect) override;
|
|
|
|
private:
|
|
static constexpr int kNavButtonCount = 4;
|
|
|
|
struct NavButton {
|
|
ui::NavButtonProvider::FrameButtonDisplayType type;
|
|
views::FrameButton frame_button;
|
|
void (views::Widget::*callback)();
|
|
int accessibility_id;
|
|
int hit_test_id;
|
|
RAW_PTR_EXCLUSION views::ImageButton* button{nullptr};
|
|
};
|
|
|
|
struct ThemeValues {
|
|
float window_border_radius;
|
|
|
|
int titlebar_min_height;
|
|
gfx::Insets titlebar_padding;
|
|
|
|
SkColor title_color;
|
|
gfx::Insets title_padding;
|
|
|
|
int button_min_size;
|
|
gfx::Insets button_padding;
|
|
};
|
|
|
|
void PaintAsActiveChanged();
|
|
|
|
void UpdateThemeValues();
|
|
|
|
enum class ButtonSide { kLeading, kTrailing };
|
|
|
|
ui::NavButtonProvider::FrameButtonDisplayType GetButtonTypeToSkip() const;
|
|
void UpdateButtonImages();
|
|
void LayoutButtons();
|
|
void LayoutButtonsOnSide(ButtonSide side,
|
|
gfx::Rect* remaining_content_bounds);
|
|
|
|
gfx::Rect GetTitlebarBounds() const;
|
|
gfx::Insets GetTitlebarContentInsets() const;
|
|
gfx::Rect GetTitlebarContentBounds() const;
|
|
|
|
gfx::Size SizeWithDecorations(gfx::Size size) const;
|
|
|
|
raw_ptr<ui::NativeTheme> theme_;
|
|
ThemeValues theme_values_;
|
|
|
|
RAW_PTR_EXCLUSION views::Label* title_;
|
|
|
|
std::unique_ptr<ui::NavButtonProvider> nav_button_provider_;
|
|
std::array<NavButton, kNavButtonCount> nav_buttons_;
|
|
|
|
std::vector<views::FrameButton> leading_frame_buttons_;
|
|
std::vector<views::FrameButton> trailing_frame_buttons_;
|
|
|
|
bool host_supports_client_frame_shadow_ = false;
|
|
|
|
raw_ptr<ui::WindowFrameProvider> frame_provider_;
|
|
|
|
base::ScopedObservation<ui::NativeTheme, ui::NativeThemeObserver>
|
|
native_theme_observer_{this};
|
|
base::ScopedObservation<ui::LinuxUi, ui::WindowButtonOrderObserver>
|
|
window_button_order_observer_{this};
|
|
|
|
base::CallbackListSubscription paint_as_active_changed_subscription_;
|
|
|
|
ui::WindowTiledEdges tiled_edges_;
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // ELECTRON_SHELL_BROWSER_UI_VIEWS_CLIENT_FRAME_VIEW_LINUX_H_
|