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

refactor: make NativeWindow getter methods const (#40804)

Browse source 
* refactor: make NativeWindow getter methods const

* fixup! refactor: make NativeWindow getter methods const

make GetZOrderLevel() const

* fixup! refactor: make NativeWindow getter methods const

fix oops
This commit is contained in:
Charles Kerr 2024-01-04 09:51:59 -06:00 • committed by GitHub
parent 3a06047e61
commit f229201f41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 238 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

56
shell/browser/native_window_views.cc
View file

@ -502,7 +502,7 @@ void NativeWindowViews::Focus(bool focus) {
}
}
bool NativeWindowViews::IsFocused() {
bool NativeWindowViews::IsFocused() const {
return widget()->IsActive();
}
@ -562,7 +562,7 @@ void NativeWindowViews::Hide() {
#endif
}
bool NativeWindowViews::IsVisible() {
bool NativeWindowViews::IsVisible() const {
#if BUILDFLAG(IS_WIN)
// widget()->IsVisible() calls ::IsWindowVisible, which returns non-zero if a
// window or any of its parent windows are visible. We want to only check the
@ -576,7 +576,7 @@ bool NativeWindowViews::IsVisible() {
#endif
}
bool NativeWindowViews::IsEnabled() {
bool NativeWindowViews::IsEnabled() const {
#if BUILDFLAG(IS_WIN)
return ::IsWindowEnabled(GetAcceleratedWidget());
#elif BUILDFLAG(IS_LINUX)
@ -606,7 +606,7 @@ void NativeWindowViews::SetEnabled(bool enable) {
}
}
bool NativeWindowViews::ShouldBeEnabled() {
bool NativeWindowViews::ShouldBeEnabled() const {
return is_enabled_ && (num_modal_children_ == 0);
}
@ -666,7 +666,7 @@ void NativeWindowViews::Unmaximize() {
}
}
bool NativeWindowViews::IsMaximized() {
bool NativeWindowViews::IsMaximized() const {
if (widget()->IsMaximized()) {
return true;
} else {
@ -701,7 +701,7 @@ void NativeWindowViews::Restore() {
#endif
}
bool NativeWindowViews::IsMinimized() {
bool NativeWindowViews::IsMinimized() const {
return widget()->IsMinimized();
}
@ -787,7 +787,7 @@ void NativeWindowViews::SetBounds(const gfx::Rect& bounds, bool animate) {
widget()->SetBounds(bounds);
}
gfx::Rect NativeWindowViews::GetBounds() {
gfx::Rect NativeWindowViews::GetBounds() const {
#if BUILDFLAG(IS_WIN)
if (IsMinimized())
return widget()->GetRestoredBounds();
@ -796,11 +796,11 @@ gfx::Rect NativeWindowViews::GetBounds() {
return widget()->GetWindowBoundsInScreen();
}
gfx::Rect NativeWindowViews::GetContentBounds() {
gfx::Rect NativeWindowViews::GetContentBounds() const {
return content_view() ? content_view()->GetBoundsInScreen() : gfx::Rect();
}
gfx::Size NativeWindowViews::GetContentSize() {
gfx::Size NativeWindowViews::GetContentSize() const {
#if BUILDFLAG(IS_WIN)
if (IsMinimized())
return NativeWindow::GetContentSize();
@ -809,7 +809,7 @@ gfx::Size NativeWindowViews::GetContentSize() {
return content_view() ? content_view()->size() : gfx::Size();
}
gfx::Rect NativeWindowViews::GetNormalBounds() {
gfx::Rect NativeWindowViews::GetNormalBounds() const {
#if BUILDFLAG(IS_WIN)
if (IsMaximized() && transparent())
return restore_bounds_;
@ -923,7 +923,7 @@ void NativeWindowViews::MoveTop() {
#endif
}
bool NativeWindowViews::IsResizable() {
bool NativeWindowViews::IsResizable() const {
#if BUILDFLAG(IS_WIN)
if (has_frame())
return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_THICKFRAME;
@ -945,7 +945,7 @@ void NativeWindowViews::SetMovable(bool movable) {
movable_ = movable;
}
bool NativeWindowViews::IsMovable() {
bool NativeWindowViews::IsMovable() const {
#if BUILDFLAG(IS_WIN)
return movable_;
#else
@ -965,7 +965,7 @@ void NativeWindowViews::SetMinimizable(bool minimizable) {
minimizable_ = minimizable;
}
bool NativeWindowViews::IsMinimizable() {
bool NativeWindowViews::IsMinimizable() const {
#if BUILDFLAG(IS_WIN)
return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MINIMIZEBOX;
#else
@ -985,7 +985,7 @@ void NativeWindowViews::SetMaximizable(bool maximizable) {
maximizable_ = maximizable;
}
bool NativeWindowViews::IsMaximizable() {
bool NativeWindowViews::IsMaximizable() const {
#if BUILDFLAG(IS_WIN)
return ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_MAXIMIZEBOX;
#else
@ -995,7 +995,7 @@ bool NativeWindowViews::IsMaximizable() {
void NativeWindowViews::SetExcludedFromShownWindowsMenu(bool excluded) {}
bool NativeWindowViews::IsExcludedFromShownWindowsMenu() {
bool NativeWindowViews::IsExcludedFromShownWindowsMenu() const {
// return false on unsupported platforms
return false;
}
@ -1004,7 +1004,7 @@ void NativeWindowViews::SetFullScreenable(bool fullscreenable) {
fullscreenable_ = fullscreenable;
}
bool NativeWindowViews::IsFullScreenable() {
bool NativeWindowViews::IsFullScreenable() const {
return fullscreenable_;
}
@ -1024,7 +1024,7 @@ void NativeWindowViews::SetClosable(bool closable) {
#endif
}
bool NativeWindowViews::IsClosable() {
bool NativeWindowViews::IsClosable() const {
#if BUILDFLAG(IS_WIN)
HMENU menu = GetSystemMenu(GetAcceleratedWidget(), false);
MENUITEMINFO info;
@ -1065,7 +1065,7 @@ void NativeWindowViews::SetAlwaysOnTop(ui::ZOrderLevel z_order,
NativeWindow::NotifyWindowAlwaysOnTopChanged();
}
ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() {
ui::ZOrderLevel NativeWindowViews::GetZOrderLevel() const {
return widget()->GetZOrderLevel();
}
@ -1082,7 +1082,7 @@ void NativeWindowViews::SetTitle(const std::string& title) {
widget()->UpdateWindowTitle();
}
std::string NativeWindowViews::GetTitle() {
std::string NativeWindowViews::GetTitle() const {
return title_;
}
@ -1123,7 +1123,7 @@ void NativeWindowViews::SetSimpleFullScreen(bool simple_fullscreen) {
SetFullScreen(simple_fullscreen);
}
bool NativeWindowViews::IsSimpleFullScreen() {
bool NativeWindowViews::IsSimpleFullScreen() const {
return IsFullscreen();
}
@ -1131,7 +1131,7 @@ void NativeWindowViews::SetKiosk(bool kiosk) {
SetFullScreen(kiosk);
}
bool NativeWindowViews::IsKiosk() {
bool NativeWindowViews::IsKiosk() const {
return IsFullscreen();
}
@ -1143,7 +1143,7 @@ bool NativeWindowViews::IsTabletMode() const {
#endif
}
SkColor NativeWindowViews::GetBackgroundColor() {
SkColor NativeWindowViews::GetBackgroundColor() const {
auto* background = root_view_.background();
if (!background)
return SK_ColorTRANSPARENT;
@ -1172,7 +1172,7 @@ void NativeWindowViews::SetHasShadow(bool has_shadow) {
: wm::kShadowElevationNone);
}
bool NativeWindowViews::HasShadow() {
bool NativeWindowViews::HasShadow() const {
return GetNativeWindow()->GetProperty(wm::kShadowElevationKey) !=
wm::kShadowElevationNone;
}
@ -1194,7 +1194,7 @@ void NativeWindowViews::SetOpacity(const double opacity) {
#endif
}
double NativeWindowViews::GetOpacity() {
double NativeWindowViews::GetOpacity() const {
return opacity_;
}
@ -1271,7 +1271,7 @@ void NativeWindowViews::SetFocusable(bool focusable) {
#endif
}
bool NativeWindowViews::IsFocusable() {
bool NativeWindowViews::IsFocusable() const {
bool can_activate = widget()->widget_delegate()->CanActivate();
#if BUILDFLAG(IS_WIN)
LONG ex_style = ::GetWindowLong(GetAcceleratedWidget(), GWL_EXSTYLE);
@ -1404,7 +1404,7 @@ void NativeWindowViews::SetAutoHideMenuBar(bool auto_hide) {
root_view_.SetAutoHideMenuBar(auto_hide);
}
bool NativeWindowViews::IsMenuBarAutoHide() {
bool NativeWindowViews::IsMenuBarAutoHide() const {
return root_view_.IsMenuBarAutoHide();
}
@ -1412,7 +1412,7 @@ void NativeWindowViews::SetMenuBarVisibility(bool visible) {
root_view_.SetMenuBarVisibility(visible);
}
bool NativeWindowViews::IsMenuBarVisible() {
bool NativeWindowViews::IsMenuBarVisible() const {
return root_view_.IsMenuBarVisible();
}
@ -1454,7 +1454,7 @@ void NativeWindowViews::SetVisibleOnAllWorkspaces(
widget()->SetVisibleOnAllWorkspaces(visible);
}
bool NativeWindowViews::IsVisibleOnAllWorkspaces() {
bool NativeWindowViews::IsVisibleOnAllWorkspaces() const {
#if BUILDFLAG(IS_LINUX)
if (IsX11()) {
// Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to