mirror of
https://github.com/electron/electron.git
synced 2026-02-17 10:31:38 -05:00
96b32a814c
* chore: bump chromium in DEPS to 2930eb12d56988c2c80bad2797ab036fe493d4e1 * chore: update patches * Revert "disable robotjs-based tests" This reverts commite56adafc1f. * Revert "skip dbus tests (#18409)" This reverts commitaea042cc83. * Revert "skip more dbus tests" This reverts commit68dbef48da. * chore: bump chromium in DEPS to fd62da5601399b92effaa32a943fcd96143c8605 * chore: bump chromium in DEPS to 99f87ca22ee6e7ec953defe694771cb68f47a596 * chore: bump chromium in DEPS to d88778435b4cd9a510a63385b6d4ba24674b9774 * chore: update patches * chore: update ssl_security_state_tab_helper.patch * Remove content_packaged_services https://chromium-review.googlesource.com/c/chromium/src/+/1604203 * chore: fix false positive lint error * views: wireup widget name to crash data https://chromium-review.googlesource.com/c/chromium/src/+/1626640 * chore: bump chromium in DEPS to ab588d36191964c4bca8de5c320534d95606c861 * roll patches
60 lines
2.3 KiB
C++
60 lines
2.3 KiB
C++
// Copyright (c) 2017 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "atom/browser/ui/win/atom_desktop_native_widget_aura.h"
|
|
|
|
#include "atom/browser/ui/win/atom_desktop_window_tree_host_win.h"
|
|
#include "ui/views/corewm/tooltip_controller.h"
|
|
#include "ui/wm/public/tooltip_client.h"
|
|
|
|
namespace atom {
|
|
|
|
AtomDesktopNativeWidgetAura::AtomDesktopNativeWidgetAura(
|
|
NativeWindowViews* native_window_view)
|
|
: views::DesktopNativeWidgetAura(native_window_view->widget()),
|
|
native_window_view_(native_window_view) {
|
|
GetNativeWindow()->SetName("AtomDesktopNativeWidgetAura");
|
|
// This is to enable the override of OnWindowActivated
|
|
wm::SetActivationChangeObserver(GetNativeWindow(), this);
|
|
}
|
|
|
|
void AtomDesktopNativeWidgetAura::InitNativeWidget(
|
|
const views::Widget::InitParams& params) {
|
|
views::Widget::InitParams modified_params = params;
|
|
desktop_window_tree_host_ = new AtomDesktopWindowTreeHostWin(
|
|
native_window_view_,
|
|
static_cast<views::DesktopNativeWidgetAura*>(params.native_widget));
|
|
modified_params.desktop_window_tree_host = desktop_window_tree_host_;
|
|
views::DesktopNativeWidgetAura::InitNativeWidget(modified_params);
|
|
}
|
|
|
|
void AtomDesktopNativeWidgetAura::Activate() {
|
|
// Activate can cause the focused window to be blurred so only
|
|
// call when the window being activated is visible. This prevents
|
|
// hidden windows from blurring the focused window when created.
|
|
if (IsVisible())
|
|
views::DesktopNativeWidgetAura::Activate();
|
|
}
|
|
|
|
void AtomDesktopNativeWidgetAura::OnWindowActivated(
|
|
wm::ActivationChangeObserver::ActivationReason reason,
|
|
aura::Window* gained_active,
|
|
aura::Window* lost_active) {
|
|
views::DesktopNativeWidgetAura::OnWindowActivated(reason, gained_active,
|
|
lost_active);
|
|
if (lost_active != nullptr) {
|
|
auto* tooltip_controller = static_cast<views::corewm::TooltipController*>(
|
|
wm::GetTooltipClient(lost_active->GetRootWindow()));
|
|
|
|
// This will cause the tooltip to be hidden when a window is deactivated,
|
|
// as it should be.
|
|
// TODO(brenca): Remove this fix when the chromium issue is fixed.
|
|
// crbug.com/724538
|
|
if (tooltip_controller != nullptr)
|
|
tooltip_controller->OnCancelMode(nullptr);
|
|
}
|
|
}
|
|
|
|
} // namespace atom
|