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.
165 lines
5.9 KiB
C++
165 lines
5.9 KiB
C++
// Copyright (c) 2016 Marshall A. Greenblatt. All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following disclaimer
|
|
// in the documentation and/or other materials provided with the
|
|
// distribution.
|
|
// * Neither the name of Google Inc. nor the name Chromium Embedded
|
|
// Framework nor the names of its contributors may be used to endorse
|
|
// or promote products derived from this software without specific prior
|
|
// written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// The contents of this file must follow a specific format in order to
|
|
// support the CEF translator tool. See the translator.README.txt file in the
|
|
// tools directory for more information.
|
|
//
|
|
|
|
#ifndef CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_
|
|
#define CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_
|
|
#pragma once
|
|
|
|
#include "include/views/cef_panel_delegate.h"
|
|
|
|
class CefWindow;
|
|
|
|
///
|
|
// Implement this interface to handle window events. The methods of this class
|
|
// will be called on the browser process UI thread unless otherwise indicated.
|
|
///
|
|
/*--cef(source=client)--*/
|
|
class CefWindowDelegate : public CefPanelDelegate {
|
|
public:
|
|
///
|
|
// Called when |window| is created.
|
|
///
|
|
/*--cef()--*/
|
|
virtual void OnWindowCreated(CefRefPtr<CefWindow> window) {}
|
|
|
|
///
|
|
// Called when |window| is destroyed. Release all references to |window| and
|
|
// do not attempt to execute any methods on |window| after this callback
|
|
// returns.
|
|
///
|
|
/*--cef()--*/
|
|
virtual void OnWindowDestroyed(CefRefPtr<CefWindow> window) {}
|
|
|
|
///
|
|
// Called when |window| is activated or deactivated.
|
|
///
|
|
/*--cef()--*/
|
|
virtual void OnWindowActivationChanged(CefRefPtr<CefWindow> window,
|
|
bool active) {}
|
|
|
|
///
|
|
// Return the parent for |window| or NULL if the |window| does not have a
|
|
// parent. Windows with parents will not get a taskbar button. Set |is_menu|
|
|
// to true if |window| will be displayed as a menu, in which case it will not
|
|
// be clipped to the parent window bounds. Set |can_activate_menu| to false
|
|
// if |is_menu| is true and |window| should not be activated (given keyboard
|
|
// focus) when displayed.
|
|
///
|
|
/*--cef()--*/
|
|
virtual CefRefPtr<CefWindow> GetParentWindow(CefRefPtr<CefWindow> window,
|
|
bool* is_menu,
|
|
bool* can_activate_menu) {
|
|
return nullptr;
|
|
}
|
|
|
|
///
|
|
// Return the initial bounds for |window| in density independent pixel (DIP)
|
|
// coordinates. If this method returns an empty CefRect then
|
|
// GetPreferredSize() will be called to retrieve the size, and the window will
|
|
// be placed on the screen with origin (0,0). This method can be used in
|
|
// combination with CefView::GetBoundsInScreen() to restore the previous
|
|
// window bounds.
|
|
///
|
|
/*--cef()--*/
|
|
virtual CefRect GetInitialBounds(CefRefPtr<CefWindow> window) {
|
|
return CefRect();
|
|
}
|
|
|
|
///
|
|
// Return the initial show state for |window|.
|
|
///
|
|
/*--cef(default_retval=CEF_SHOW_STATE_NORMAL)--*/
|
|
virtual cef_show_state_t GetInitialShowState(CefRefPtr<CefWindow> window) {
|
|
return CEF_SHOW_STATE_NORMAL;
|
|
}
|
|
|
|
///
|
|
// Return true if |window| should be created without a frame or title bar. The
|
|
// window will be resizable if CanResize() returns true. Use
|
|
// CefWindow::SetDraggableRegions() to specify draggable regions.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool IsFrameless(CefRefPtr<CefWindow> window) { return false; }
|
|
|
|
///
|
|
// Return true if |window| can be resized.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool CanResize(CefRefPtr<CefWindow> window) { return true; }
|
|
|
|
///
|
|
// Return true if |window| can be maximized.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool CanMaximize(CefRefPtr<CefWindow> window) { return true; }
|
|
|
|
///
|
|
// Return true if |window| can be minimized.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool CanMinimize(CefRefPtr<CefWindow> window) { return true; }
|
|
|
|
///
|
|
// Return true if |window| can be closed. This will be called for user-
|
|
// initiated window close actions and when CefWindow::Close() is called.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool CanClose(CefRefPtr<CefWindow> window) { return true; }
|
|
|
|
///
|
|
// Called when a keyboard accelerator registered with
|
|
// CefWindow::SetAccelerator is triggered. Return true if the accelerator was
|
|
// handled or false otherwise.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool OnAccelerator(CefRefPtr<CefWindow> window, int command_id) {
|
|
return false;
|
|
}
|
|
|
|
///
|
|
// Called after all other controls in the window have had a chance to
|
|
// handle the event. |event| contains information about the keyboard event.
|
|
// Return true if the keyboard event was handled or false otherwise.
|
|
///
|
|
/*--cef()--*/
|
|
virtual bool OnKeyEvent(CefRefPtr<CefWindow> window,
|
|
const CefKeyEvent& event) {
|
|
return false;
|
|
}
|
|
};
|
|
|
|
#endif // CEF_INCLUDE_VIEWS_CEF_WINDOW_DELEGATE_H_
|