beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Everywhere: Use the Optional<T>::operator==(T) operator

Browse source 
In general, I think `opt == x` looks much nicer than
`opt.has_value() && opt.value() == x`, so I'm updating
the remaining few instances I could find with some regex
magic in my search.
This commit is contained in:
Mustafa Quraish 2021-08-27 11:30:23 -04:00 committed by Andreas Kling
parent 2dc614127e
commit 75a706b6eb
Notes: sideshowbarker 2024-07-18 05:12:25 +09:00 
Author: https://github.com/mustafaquraish
Commit: https://github.com/SerenityOS/serenity/commit/75a706b6eb4
Pull-request: https://github.com/SerenityOS/serenity/pull/9640
Reviewed-by: https://github.com/alimpfard
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/PixelPaint/LayerListWidget.cpp
View file

@ -307,7 +307,7 @@ void LayerListWidget::relayout_gadgets()
for (auto& gadget : m_gadgets) { for (auto& gadget : m_gadgets) {
if (gadget.is_moving) if (gadget.is_moving)
continue; continue;
if (hole_index.has_value() && index == hole_index.value()) if (index == hole_index)
y += vertical_step; y += vertical_step;
gadget.rect = { 0, y, widget_inner_rect().width(), gadget_height }; gadget.rect = { 0, y, widget_inner_rect().width(), gadget_height };
y += vertical_step; y += vertical_step;

8
Userland/Libraries/LibGUI/TabWidget.cpp
View file

@ -218,7 +218,7 @@ void TabWidget::paint_event(PaintEvent& event)
for (size_t i = 0; i < m_tabs.size(); ++i) { for (size_t i = 0; i < m_tabs.size(); ++i) {
if (m_tabs[i].widget == m_active_widget) if (m_tabs[i].widget == m_active_widget)
continue; continue;
bool hovered = m_hovered_tab_index.has_value() && i == m_hovered_tab_index.value(); bool hovered = i == m_hovered_tab_index;
auto button_rect = this->button_rect(i); auto button_rect = this->button_rect(i);
Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), false, hovered, m_tabs[i].widget->is_enabled(), m_tab_position == TabPosition::Top, window()->is_active()); Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), false, hovered, m_tabs[i].widget->is_enabled(), m_tab_position == TabPosition::Top, window()->is_active());
auto tab_button_content_rect = button_rect.translated(4, m_tab_position == TabPosition::Top ? 1 : 0); auto tab_button_content_rect = button_rect.translated(4, m_tab_position == TabPosition::Top ? 1 : 0);
@ -237,7 +237,7 @@ void TabWidget::paint_event(PaintEvent& event)
for (size_t i = 0; i < m_tabs.size(); ++i) { for (size_t i = 0; i < m_tabs.size(); ++i) {
if (m_tabs[i].widget != m_active_widget) if (m_tabs[i].widget != m_active_widget)
continue; continue;
bool hovered = m_hovered_tab_index.has_value() && i == m_hovered_tab_index.value(); bool hovered = i == m_hovered_tab_index;
auto button_rect = this->button_rect(i); auto button_rect = this->button_rect(i);
Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), true, hovered, m_tabs[i].widget->is_enabled(), m_tab_position == TabPosition::Top, window()->is_active()); Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), true, hovered, m_tabs[i].widget->is_enabled(), m_tab_position == TabPosition::Top, window()->is_active());
auto tab_button_content_rect = button_rect.translated(4, m_tab_position == TabPosition::Top ? 1 : 0); auto tab_button_content_rect = button_rect.translated(4, m_tab_position == TabPosition::Top ? 1 : 0);
@ -270,8 +270,8 @@ void TabWidget::paint_event(PaintEvent& event)
return; return;
for (size_t i = 0; i < m_tabs.size(); ++i) { for (size_t i = 0; i < m_tabs.size(); ++i) {
bool hovered_close_button = m_hovered_close_button_index.has_value() && i == m_hovered_close_button_index.value(); bool hovered_close_button = i == m_hovered_close_button_index;
bool pressed_close_button = m_pressed_close_button_index.has_value() && i == m_pressed_close_button_index.value(); bool pressed_close_button = i == m_pressed_close_button_index;
auto close_button_rect = this->close_button_rect(i); auto close_button_rect = this->close_button_rect(i);
if (hovered_close_button) if (hovered_close_button)