mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: remove accessible_pane_view.patch (#29262)

Browse source
This commit is contained in:
Cheng Zhao 2021-05-22 02:00:47 +09:00 • committed by GitHub
parent 4e2934a872
commit 259bf8c4f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

55
shell/browser/ui/views/menu_bar.h
View file

@ -5,43 +5,25 @@
#ifndef SHELL_BROWSER_UI_VIEWS_MENU_BAR_H_
#define SHELL_BROWSER_UI_VIEWS_MENU_BAR_H_
#include <memory>
#include "shell/browser/native_window_observer.h"
#include "shell/browser/ui/electron_menu_model.h"
#include "shell/browser/ui/views/menu_delegate.h"
#include "shell/browser/ui/views/root_view.h"
#include "ui/views/accessible_pane_view.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/focus/focus_manager.h"
#include "ui/views/view.h"
namespace views {
class Button;
class MenuButton;
} // namespace views
}
namespace electron {
class MenuBarColorUpdater : public views::FocusChangeListener {
public:
explicit MenuBarColorUpdater(MenuBar* menu_bar);
~MenuBarColorUpdater() override;
void OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) override;
void OnWillChangeFocus(views::View* focused_before,
views::View* focused_now) override {}
private:
MenuBar* menu_bar_;
};
class MenuBar : public views::AccessiblePaneView,
public electron::MenuDelegate::Observer {
public MenuDelegate::Observer,
public NativeWindowObserver {
public:
static const char kViewClassName[];
explicit MenuBar(RootView* window);
MenuBar(NativeWindow* window, RootView* root_view);
~MenuBar() override;
// Replaces current menu with a new one.
@ -64,18 +46,22 @@ class MenuBar : public views::AccessiblePaneView,
ElectronMenuModel** menu_model,
views::MenuButton** button);
// electron::MenuDelegate::Observer:
private:
// MenuDelegate::Observer:
void OnBeforeExecuteCommand() override;
void OnMenuClosed() override;
// NativeWindowObserver:
void OnWindowBlur() override;
void OnWindowFocus() override;
// views::AccessiblePaneView:
bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
bool SetPaneFocus(views::View* initial_focus) override;
void RemovePaneFocus() override;
bool SetPaneFocusAndFocusDefault() override;
void OnThemeChanged() override;
private:
friend class MenuBarColorUpdater;
// views::FocusChangeListener:
void OnDidChangeFocus(View* focused_before, View* focused_now) override;
// views::View:
const char* GetClassName() const override;
@ -84,22 +70,19 @@ class MenuBar : public views::AccessiblePaneView,
void RebuildChildren();
void UpdateViewColors();
void RefreshColorCache();
View* FindAccelChild(char16_t key);
SkColor background_color_;
#if defined(OS_LINUX)
SkColor enabled_color_;
SkColor disabled_color_;
#endif
RootView* window_ = nullptr;
NativeWindow* window_;
RootView* root_view_;
ElectronMenuModel* menu_model_ = nullptr;
View* FindAccelChild(char16_t key);
bool has_focus_ = true;
std::unique_ptr<MenuBarColorUpdater> color_updater_;
bool accelerator_installed_ = false;
DISALLOW_COPY_AND_ASSIGN(MenuBar);
};