mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-13 01:56:20 +01:00
d8db6fa9da
This change provides a generic solution for active (key) window tracking that works with both Views-hosted and native windows on MacOS. With this new approach we can now successfully route top menu actions to the currently active window. Prior to this change CEF's Views API was using focus notifications as a proxy for window activation notifications. That doesn't work on MacOS where NSWindow activation (key status) is independent of NSView focus (first responder) status, and changes in activation don't necessarily generate focus notifications (see NativeWidgetMac::OnWindowKeyStatusChanged). To make this work reliably on all platforms we now expose a CefWindowDelegate::OnWindowActivationChanged callback. This change also fixes an uninitialized variable (RootWindowMacImpl::with_extension_) that was causing flaky behavior in RootWindowManager::OnRootWindowActivated. To test: 1. Run `cefclient [--use-views]` 2. Select Popup Window from the Tests menu. Do not explicitly activate the popup window (e.g. don't click on it). 3. Verify that further Tests menu actions go to the popup window. 4. Change activation to a first window by clicking on it. Verify that Test menu actions go to that window. 5. Close the currently active window. Do not explicitly activate the remaining window (e.g. don't click on it). 6. Verify that Test menu actions go to the only remaining window.
139 lines
4.8 KiB
C++
139 lines
4.8 KiB
C++
// Copyright 2016 The Chromium Embedded Framework Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be found
|
|
// in the LICENSE file.
|
|
|
|
#ifndef CEF_LIBCEF_BROWSER_VIEWS_WINDOW_VIEW_H_
|
|
#define CEF_LIBCEF_BROWSER_VIEWS_WINDOW_VIEW_H_
|
|
#pragma once
|
|
|
|
#include <vector>
|
|
|
|
#include "include/views/cef_window.h"
|
|
#include "include/views/cef_window_delegate.h"
|
|
|
|
#include "libcef/browser/views/overlay_view_host.h"
|
|
#include "libcef/browser/views/panel_view.h"
|
|
|
|
#include "third_party/skia/include/core/SkRegion.h"
|
|
#include "ui/display/display.h"
|
|
#include "ui/views/widget/widget_delegate.h"
|
|
#include "ui/views/widget/widget_observer.h"
|
|
|
|
// Manages the views-based root window. This object will be deleted
|
|
// automatically when the associated root window is destroyed.
|
|
class CefWindowView
|
|
: public CefPanelView<views::WidgetDelegateView, CefWindowDelegate>,
|
|
public views::WidgetObserver {
|
|
public:
|
|
using ParentClass =
|
|
CefPanelView<views::WidgetDelegateView, CefWindowDelegate>;
|
|
|
|
class Delegate {
|
|
public:
|
|
// Returns true to signal that the Widget can be closed.
|
|
virtual bool CanWidgetClose() = 0;
|
|
|
|
// Called when the underlying platform window is closing.
|
|
virtual void OnWindowClosing() = 0;
|
|
|
|
// Called when the WindowView is about to be deleted.
|
|
virtual void OnWindowViewDeleted() = 0;
|
|
|
|
protected:
|
|
virtual ~Delegate() {}
|
|
};
|
|
|
|
// |cef_delegate| may be nullptr.
|
|
// |window_delegate| must be non-nullptr.
|
|
CefWindowView(CefWindowDelegate* cef_delegate, Delegate* window_delegate);
|
|
|
|
CefWindowView(const CefWindowView&) = delete;
|
|
CefWindowView& operator=(const CefWindowView&) = delete;
|
|
|
|
// Create the Widget.
|
|
void CreateWidget(gfx::AcceleratedWidget parent_widget);
|
|
|
|
// Returns the CefWindow associated with this view. See comments on
|
|
// CefViewView::GetCefView.
|
|
CefRefPtr<CefWindow> GetCefWindow() const;
|
|
|
|
// views::WidgetDelegate methods:
|
|
bool CanMinimize() const override;
|
|
bool CanMaximize() const override;
|
|
std::u16string GetWindowTitle() const override;
|
|
ui::ImageModel GetWindowIcon() override;
|
|
ui::ImageModel GetWindowAppIcon() override;
|
|
void WindowClosing() override;
|
|
views::View* GetContentsView() override;
|
|
views::ClientView* CreateClientView(views::Widget* widget) override;
|
|
std::unique_ptr<views::NonClientFrameView> CreateNonClientFrameView(
|
|
views::Widget* widget) override;
|
|
bool ShouldDescendIntoChildForEventHandling(
|
|
gfx::NativeView child,
|
|
const gfx::Point& location) override;
|
|
bool MaybeGetMinimumSize(gfx::Size* size) const override;
|
|
bool MaybeGetMaximumSize(gfx::Size* size) const override;
|
|
|
|
// views::View methods:
|
|
void ViewHierarchyChanged(
|
|
const views::ViewHierarchyChangedDetails& details) override;
|
|
|
|
// views::WidgetObserver methods:
|
|
void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
|
|
void OnWidgetBoundsChanged(views::Widget* widget,
|
|
const gfx::Rect& new_bounds) override;
|
|
|
|
// Returns the Display containing this Window.
|
|
display::Display GetDisplay() const;
|
|
|
|
// Set/get the window title.
|
|
void SetTitle(const std::u16string& title);
|
|
std::u16string title() const { return title_; }
|
|
|
|
// Set/get the window icon. This should be a 16x16 icon suitable for use in
|
|
// the Windows's title bar.
|
|
void SetWindowIcon(CefRefPtr<CefImage> window_icon);
|
|
CefRefPtr<CefImage> window_icon() const { return window_icon_; }
|
|
|
|
// Set/get the window app icon. This should be a larger icon for use in the
|
|
// host environment app switching UI. On Windows, this is the ICON_BIG used in
|
|
// Alt-Tab list and Windows taskbar. The Window icon will be used by default
|
|
// if no Window App icon is specified.
|
|
void SetWindowAppIcon(CefRefPtr<CefImage> window_app_icon);
|
|
CefRefPtr<CefImage> window_app_icon() const { return window_app_icon_; }
|
|
|
|
CefRefPtr<CefOverlayController> AddOverlayView(
|
|
CefRefPtr<CefView> view,
|
|
cef_docking_mode_t docking_mode);
|
|
|
|
// Set/get the draggable regions.
|
|
void SetDraggableRegions(const std::vector<CefDraggableRegion>& regions);
|
|
SkRegion* draggable_region() const { return draggable_region_.get(); }
|
|
|
|
// Returns the NonClientFrameView for this Window. May be nullptr.
|
|
views::NonClientFrameView* GetNonClientFrameView() const;
|
|
|
|
private:
|
|
// Called when removed from the Widget and before |this| is deleted.
|
|
void DeleteDelegate();
|
|
|
|
void MoveOverlaysIfNecessary();
|
|
|
|
// Not owned by this object.
|
|
Delegate* window_delegate_;
|
|
|
|
// True if the window is frameless. It might still be resizable and draggable.
|
|
bool is_frameless_;
|
|
|
|
std::u16string title_;
|
|
CefRefPtr<CefImage> window_icon_;
|
|
CefRefPtr<CefImage> window_app_icon_;
|
|
|
|
std::unique_ptr<SkRegion> draggable_region_;
|
|
|
|
// Hosts for overlay widgets.
|
|
std::vector<std::unique_ptr<CefOverlayViewHost>> overlay_hosts_;
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_BROWSER_VIEWS_WINDOW_VIEW_H_
|