0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-01 20:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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
Notes: sideshowbarker 2024-07-17 16:23:06 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/98b8bab441
Pull-request: https://github.com/SerenityOS/serenity/pull/18584
3 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibGUI/Widget.cpp
View file

@ -1128,15 +1128,7 @@ Gfx::IntRect Widget::children_clip_rect() const
void Widget::set_override_cursor(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap const>> cursor)
{
auto const& are_cursors_the_same = [](auto const& a, auto const& b) {
if (a.template has<Gfx::StandardCursor>() != b.template has<Gfx::StandardCursor>())
return false;
if (a.template has<Gfx::StandardCursor>())
return a.template get<Gfx::StandardCursor>() == b.template get<Gfx::StandardCursor>();
return a.template get<NonnullRefPtr<Gfx::Bitmap const>>().ptr() == b.template get<NonnullRefPtr<Gfx::Bitmap const>>().ptr();
};
if (are_cursors_the_same(m_override_cursor, cursor))
if (m_override_cursor == cursor)
return;
m_override_cursor = move(cursor);

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;

2
Userland/Libraries/LibGUI/Window.h
View file

@ -279,8 +279,6 @@ private:
void flip(Vector<Gfx::IntRect, 32> const& dirty_rects);
void force_update();
bool are_cursors_the_same(AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap const>> const&, AK::Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap const>> const&) const;
WeakPtr<Widget> m_previously_focused_widget;
OwnPtr<WindowBackingStore> m_front_store;