RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:47:35 +00:00
Code Issues Activity Actions

AK: Improve smart pointer ergonomics a bit.

Browse source
This commit is contained in:
Andreas Kling 2019-04-14 02:36:06 +02:00
parent d5dec1922b
commit 3f6408919f
17 changed files with 49 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSMenu.cpp
View file

@ -92,7 +92,7 @@ void WSMenu::draw()
for (auto& item : m_items) {
if (item->type() == WSMenuItem::Text) {
Color text_color = Color::Black;
if (item.ptr() == m_hovered_item) {
if (item == m_hovered_item) {
painter.fill_rect(item->rect(), WSWindowManager::the().menu_selection_color());
text_color = Color::White;
}

6
Servers/WindowServer/WSWindowFrame.cpp
View file

@ -146,17 +146,17 @@ void WSWindowFrame::paint(Painter& painter)
auto& wm = WSWindowManager::the();
if (&window == wm.m_highlight_window.ptr()) {
if (&window == wm.m_highlight_window) {
border_color = wm.m_highlight_window_border_color;
border_color2 = wm.m_highlight_window_border_color2;
title_color = wm.m_highlight_window_title_color;
middle_border_color = Color::White;
} else if (&window == wm.m_drag_window.ptr()) {
} else if (&window == wm.m_drag_window) {
border_color = wm.m_dragging_window_border_color;
border_color2 = wm.m_dragging_window_border_color2;
title_color = wm.m_dragging_window_title_color;
middle_border_color = Color::from_rgb(0xf9b36a);
} else if (&window == wm.m_active_window.ptr()) {
} else if (&window == wm.m_active_window) {
border_color = wm.m_active_window_border_color;
border_color2 = wm.m_active_window_border_color2;
title_color = wm.m_active_window_title_color;

6
Servers/WindowServer/WSWindowManager.cpp
View file

@ -1010,7 +1010,7 @@ void WSWindowManager::on_message(const WSMessage& message)
void WSWindowManager::set_highlight_window(WSWindow* window)
{
if (window == m_highlight_window.ptr())
if (window == m_highlight_window)
return;
if (auto* previous_highlight_window = m_highlight_window.ptr())
invalidate(*previous_highlight_window);
@ -1029,7 +1029,7 @@ void WSWindowManager::set_active_window(WSWindow* window)
return;
}
if (window == m_active_window.ptr())
if (window == m_active_window)
return;
auto* previously_active_window = m_active_window.ptr();
@ -1053,7 +1053,7 @@ void WSWindowManager::set_active_window(WSWindow* window)
void WSWindowManager::set_hovered_window(WSWindow* window)
{
if (m_hovered_window.ptr() == window)
if (m_hovered_window == window)
return;
if (m_hovered_window)

4
Servers/WindowServer/WSWindowManager.h
View file

@ -234,7 +234,7 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_back_to_
continue;
if (window->type() != type)
continue;
if (m_highlight_window.ptr() == window) {
if (m_highlight_window == window) {
do_highlight_window_at_end = true;
continue;
}
@ -277,7 +277,7 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_front_to
continue;
if (window->type() != type)
continue;
if (window == m_highlight_window.ptr())
if (window == m_highlight_window)
continue;
if (callback(*window) == IterationDecision::Abort)
return IterationDecision::Abort;