mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 01:26:03 +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.
79 lines
3.4 KiB
C++
79 lines
3.4 KiB
C++
// Copyright (c) 2022 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.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// This file was generated by the CEF translator tool. If making changes by
|
|
// hand only do so within the body of existing method and function
|
|
// implementations. See the translator.README.txt file in the tools directory
|
|
// for more information.
|
|
//
|
|
// $hash=4041b496f1e9ed673f99211be26b8fa98967fece$
|
|
//
|
|
|
|
#ifndef CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_
|
|
#define CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_
|
|
#pragma once
|
|
|
|
#if !defined(BUILDING_CEF_SHARED)
|
|
#error This file can be included DLL-side only
|
|
#endif
|
|
|
|
#include "include/capi/views/cef_window_capi.h"
|
|
#include "include/capi/views/cef_window_delegate_capi.h"
|
|
#include "include/views/cef_window.h"
|
|
#include "include/views/cef_window_delegate.h"
|
|
#include "libcef_dll/ctocpp/ctocpp_ref_counted.h"
|
|
|
|
// Wrap a C structure with a C++ class.
|
|
// This class may be instantiated and accessed DLL-side only.
|
|
class CefWindowDelegateCToCpp
|
|
: public CefCToCppRefCounted<CefWindowDelegateCToCpp,
|
|
CefWindowDelegate,
|
|
cef_window_delegate_t> {
|
|
public:
|
|
CefWindowDelegateCToCpp();
|
|
virtual ~CefWindowDelegateCToCpp();
|
|
|
|
// CefWindowDelegate methods.
|
|
void OnWindowCreated(CefRefPtr<CefWindow> window) override;
|
|
void OnWindowDestroyed(CefRefPtr<CefWindow> window) override;
|
|
void OnWindowActivationChanged(CefRefPtr<CefWindow> window,
|
|
bool active) override;
|
|
CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
|
|
bool* is_menu,
|
|
bool* can_activate_menu) override;
|
|
CefRect GetInitialBounds(CefRefPtr<CefWindow> window) override;
|
|
cef_show_state_t GetInitialShowState(CefRefPtr<CefWindow> window) override;
|
|
bool IsFrameless(CefRefPtr<CefWindow> window) override;
|
|
bool CanResize(CefRefPtr<CefWindow> window) override;
|
|
bool CanMaximize(CefRefPtr<CefWindow> window) override;
|
|
bool CanMinimize(CefRefPtr<CefWindow> window) override;
|
|
bool CanClose(CefRefPtr<CefWindow> window) override;
|
|
bool OnAccelerator(CefRefPtr<CefWindow> window, int command_id) override;
|
|
bool OnKeyEvent(CefRefPtr<CefWindow> window,
|
|
const CefKeyEvent& event) override;
|
|
|
|
// CefPanelDelegate methods.
|
|
|
|
// CefViewDelegate methods.
|
|
CefSize GetPreferredSize(CefRefPtr<CefView> view) override;
|
|
CefSize GetMinimumSize(CefRefPtr<CefView> view) override;
|
|
CefSize GetMaximumSize(CefRefPtr<CefView> view) override;
|
|
int GetHeightForWidth(CefRefPtr<CefView> view, int width) override;
|
|
void OnParentViewChanged(CefRefPtr<CefView> view,
|
|
bool added,
|
|
CefRefPtr<CefView> parent) override;
|
|
void OnChildViewChanged(CefRefPtr<CefView> view,
|
|
bool added,
|
|
CefRefPtr<CefView> child) override;
|
|
void OnWindowChanged(CefRefPtr<CefView> view, bool added) override;
|
|
void OnLayoutChanged(CefRefPtr<CefView> view,
|
|
const CefRect& new_bounds) override;
|
|
void OnFocus(CefRefPtr<CefView> view) override;
|
|
void OnBlur(CefRefPtr<CefView> view) override;
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_
|