From 55e115b0cd0826db2a324c3ea0ee83d54e4ba298 Mon Sep 17 00:00:00 2001 From: faissaloo Date: Sun, 16 Jun 2019 21:01:51 +0100 Subject: [PATCH] LibGUI: clang-format --- LibGUI/GAbstractButton.cpp | 2 +- LibGUI/GButton.cpp | 5 ++-- LibGUI/GWindow.cpp | 48 +++++++++++++++++++++----------------- LibGUI/GWindow.h | 2 +- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/LibGUI/GAbstractButton.cpp b/LibGUI/GAbstractButton.cpp index 27b0fefb327..61aaacfed3b 100644 --- a/LibGUI/GAbstractButton.cpp +++ b/LibGUI/GAbstractButton.cpp @@ -31,7 +31,7 @@ void GAbstractButton::set_checked(bool checked) m_checked = checked; if (is_exclusive() && checked) { - parent_widget()->for_each_child_of_type([&] (auto& sibling) { + parent_widget()->for_each_child_of_type([&](auto& sibling) { if (!sibling.is_exclusive() || !sibling.is_checkable() || !sibling.is_checked()) return IterationDecision::Continue; sibling.m_checked = false; diff --git a/LibGUI/GButton.cpp b/LibGUI/GButton.cpp index ea84af5976d..203ef664e64 100644 --- a/LibGUI/GButton.cpp +++ b/LibGUI/GButton.cpp @@ -66,8 +66,9 @@ void GButton::click() on_click(*this); } -bool GButton::accepts_keyboard_select() const { - return is_enabled(); +bool GButton::accepts_keyboard_select() const +{ + return is_enabled(); } void GButton::set_action(GAction& action) diff --git a/LibGUI/GWindow.cpp b/LibGUI/GWindow.cpp index 0cc561c1567..837c29620a7 100644 --- a/LibGUI/GWindow.cpp +++ b/LibGUI/GWindow.cpp @@ -288,7 +288,7 @@ void GWindow::event(CEvent& event) auto found_widget = m_hashed_potential_keybind_widgets.find(m_entered_keybind); if (found_widget != m_hashed_potential_keybind_widgets.end()) { m_keybind_mode = false; - const auto &point = Point(); + const auto& point = Point(); auto event = make(GEvent::MouseDown, point, 0, GMouseButton::Left, 0, 0); found_widget->value->event(*event); event = make(GEvent::MouseUp, point, 0, GMouseButton::Left, 0, 0); @@ -309,8 +309,8 @@ void GWindow::event(CEvent& event) if (event.type() == GEvent::WindowBecameActive || event.type() == GEvent::WindowBecameInactive) { if (event.type() == GEvent::WindowBecameInactive && m_keybind_mode) { - m_keybind_mode = false; - update(); + m_keybind_mode = false; + update(); } m_is_active = event.type() == GEvent::WindowBecameActive; @@ -350,11 +350,13 @@ void GWindow::event(CEvent& event) CObject::event(event); } -void GWindow::paint_keybinds() { - if (!m_keybind_mode) return; +void GWindow::paint_keybinds() +{ + if (!m_keybind_mode) + return; GPainter painter(*m_main_widget); - for (auto& keypair: m_hashed_potential_keybind_widgets) { + for (auto& keypair : m_hashed_potential_keybind_widgets) { auto widget = keypair.value; bool could_be_keybind = true; for (size_t i = 0; i < m_entered_keybind.length(); i++) { @@ -364,8 +366,8 @@ void GWindow::paint_keybinds() { } if (could_be_keybind) { - auto rect = Rect(widget->x()-5, widget->y()-5, 4+Font::default_font().width(keypair.key), 16); - auto highlight_rect = Rect(widget->x()-3, widget->y()-5, 0, 16); + auto rect = Rect(widget->x() - 5, widget->y() - 5, 4 + Font::default_font().width(keypair.key), 16); + auto highlight_rect = Rect(widget->x() - 3, widget->y() - 5, 0, 16); painter.fill_rect(rect, Color::LightGray); painter.draw_rect(rect, Color::Black, false); @@ -375,23 +377,24 @@ void GWindow::paint_keybinds() { } } -void GWindow::find_keyboard_selectable() { +void GWindow::find_keyboard_selectable() +{ Vector potential_keybind_widgets; m_hashed_potential_keybind_widgets.clear(); find_keyboard_selectable_children(m_main_widget, potential_keybind_widgets); - m_max_keybind_length = ceil_div(potential_keybind_widgets.size(), ('z'-'a')); + m_max_keybind_length = ceil_div(potential_keybind_widgets.size(), ('z' - 'a')); size_t buffer_length = m_max_keybind_length + 1; char keybind_buffer[buffer_length]; - for (size_t i = 0; i < buffer_length-1; i++) { + for (size_t i = 0; i < buffer_length - 1; i++) { keybind_buffer[i] = 'a'; } - keybind_buffer[buffer_length-1] = '\0'; + keybind_buffer[buffer_length - 1] = '\0'; - for (auto& widget: potential_keybind_widgets) { + for (auto& widget : potential_keybind_widgets) { m_hashed_potential_keybind_widgets.set(String(keybind_buffer), widget); - for (size_t i = 0; i < buffer_length-1; i++) { + for (size_t i = 0; i < buffer_length - 1; i++) { if (keybind_buffer[i] >= 'z') { keybind_buffer[i] = 'a'; } else { @@ -402,14 +405,15 @@ void GWindow::find_keyboard_selectable() { } } -void GWindow::find_keyboard_selectable_children(GWidget* widget, Vector &potential_keybind_widgets) { - widget -> for_each_child_widget([&] (auto& child) { - if (child.accepts_keyboard_select()) { - potential_keybind_widgets.append(&child); - find_keyboard_selectable_children(&child, potential_keybind_widgets); - } - return IterationDecision::Continue; - }); +void GWindow::find_keyboard_selectable_children(GWidget* widget, Vector& potential_keybind_widgets) +{ + widget->for_each_child_widget([&](auto& child) { + if (child.accepts_keyboard_select()) { + potential_keybind_widgets.append(&child); + find_keyboard_selectable_children(&child, potential_keybind_widgets); + } + return IterationDecision::Continue; + }); } bool GWindow::is_visible() const diff --git a/LibGUI/GWindow.h b/LibGUI/GWindow.h index aa09e6646a1..988b81ffb1a 100644 --- a/LibGUI/GWindow.h +++ b/LibGUI/GWindow.h @@ -134,7 +134,7 @@ private: void paint_keybinds(); void find_keyboard_selectable(); - void find_keyboard_selectable_children(GWidget* widget, Vector &potential_keybind_widgets); + void find_keyboard_selectable_children(GWidget* widget, Vector& potential_keybind_widgets); Retained create_backing_bitmap(const Size&); void set_current_backing_bitmap(GraphicsBitmap&, bool flush_immediately = false); void flip(const Vector& dirty_rects);