RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:48:12 +00:00
Code Issues Activity Actions

LibGUI: Use Variant's built-in equality operator in Window and Widget

Browse source 
Now that Variant has operator==(), we don't need to go through all this
trouble to compare two Variant values.
This commit is contained in:
Andreas Kling 2023-04-30 10:42:54 +02:00
parent a268dcb1e2
commit 98b8bab441
3 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibGUI/Window.cpp
View file

@ -336,18 +336,9 @@ void Window::make_window_manager(unsigned event_mask)
GUI::ConnectionToWindowManagerServer::the().async_set_manager_window(m_window_id);
}
bool Window::are_cursors_the_same(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap const>> const& left, AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap const>> const& right) const
{
if (left.has<Gfx::StandardCursor>() != right.has<Gfx::StandardCursor>())
return false;
if (left.has<Gfx::StandardCursor>())
return left.get<Gfx::StandardCursor>() == right.get<Gfx::StandardCursor>();
return left.get<NonnullRefPtr<Gfx::Bitmap const>>().ptr() == right.get<NonnullRefPtr<Gfx::Bitmap const>>().ptr();
}
void Window::set_cursor(Gfx::StandardCursor cursor)
{
if (are_cursors_the_same(m_cursor, cursor))
if (m_cursor == cursor)
return;
m_cursor = cursor;
update_cursor();
@ -355,7 +346,7 @@ void Window::set_cursor(Gfx::StandardCursor cursor)
void Window::set_cursor(NonnullRefPtr<Gfx::Bitmap const> cursor)
{
if (are_cursors_the_same(m_cursor, cursor))
if (m_cursor == cursor)
return;
m_cursor = cursor;
update_cursor();
@ -1281,7 +1272,7 @@ void Window::update_cursor()
new_cursor = widget->override_cursor();
}
if (are_cursors_the_same(m_effective_cursor, new_cursor))
if (m_effective_cursor == new_cursor)
return;
m_effective_cursor = new_cursor;