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

Meta: Tweak .clang-format to not wrap braces after enums.

Browse source
This commit is contained in:
Andreas Kling 2019-06-07 17:13:23 +02:00
parent 9145917bf0
commit 39d1a9ae66
97 changed files with 186 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Servers/WindowServer/WSAPITypes.h
View file

@ -20,8 +20,7 @@ struct WSAPI_Rect {
WSAPI_Size size;
};
enum WSAPI_WindowType
{
enum WSAPI_WindowType {
Invalid = 0,
Normal,
Menu,
@ -37,8 +36,7 @@ struct WSAPI_WindowBackingStoreInfo {
RGBA32* pixels;
};
enum class WSAPI_MouseButton : unsigned char
{
enum class WSAPI_MouseButton : unsigned char {
NoButton = 0,
Left = 1,
Right = 2,
@ -46,16 +44,14 @@ enum class WSAPI_MouseButton : unsigned char
};
struct WSAPI_KeyModifiers {
enum
{
enum {
Shift = 1 << 0,
Alt = 1 << 1,
Ctrl = 1 << 2,
};
};
enum class WSAPI_StandardCursor : unsigned char
{
enum class WSAPI_StandardCursor : unsigned char {
None = 0,
Arrow,
IBeam,
@ -65,8 +61,7 @@ enum class WSAPI_StandardCursor : unsigned char
ResizeDiagonalBLTR,
};
enum WSAPI_WMEventMask : unsigned
{
enum WSAPI_WMEventMask : unsigned {
WindowRectChanges = 1 << 0,
WindowStateChanges = 1 << 1,
WindowIconChanges = 1 << 2,
@ -74,8 +69,7 @@ enum WSAPI_WMEventMask : unsigned
};
struct WSAPI_ServerMessage {
enum Type : unsigned
{
enum Type : unsigned {
Invalid,
Error,
Paint,
@ -195,8 +189,7 @@ struct WSAPI_ServerMessage {
};
struct WSAPI_ClientMessage {
enum Type : unsigned
{
enum Type : unsigned {
Invalid,
CreateMenubar,
DestroyMenubar,

4
Servers/WindowServer/WSClientConnection.h
View file

@ -105,7 +105,7 @@ void WSClientConnection::for_each_window_matching(Matching matching, Callback ca
{
for (auto& it : m_windows) {
if (matching(*it.value)) {
if (callback(*it.value) == IterationDecision::Abort)
if (callback(*it.value) == IterationDecision::Break)
return;
}
}
@ -115,7 +115,7 @@ template<typename Callback>
void WSClientConnection::for_each_window(Callback callback)
{
for (auto& it : m_windows) {
if (callback(*it.value) == IterationDecision::Abort)
if (callback(*it.value) == IterationDecision::Break)
return;
}
}

3
Servers/WindowServer/WSCompositor.h
View file

@ -10,8 +10,7 @@
class Painter;
class WSCursor;
enum class WallpaperMode
{
enum class WallpaperMode {
Simple,
Tile,
Center,

3
Servers/WindowServer/WSCursor.h
View file

@ -2,8 +2,7 @@
#include <SharedGraphics/GraphicsBitmap.h>
enum class WSStandardCursor
{
enum class WSStandardCursor {
None = 0,
Arrow,
IBeam,

6
Servers/WindowServer/WSEvent.h
View file

@ -11,8 +11,7 @@
class WSEvent : public CEvent {
public:
enum Type
{
enum Type {
Invalid = 2000,
WM_DeferredCompose,
WM_ClientDisconnected,
@ -706,8 +705,7 @@ private:
Vector<Rect, 32> m_rects;
};
enum class MouseButton : byte
{
enum class MouseButton : byte {
None = 0,
Left = 1,
Right = 2,

3
Servers/WindowServer/WSMenuItem.h
View file

@ -8,8 +8,7 @@ class WSMenu;
class WSMenuItem {
public:
enum Type
{
enum Type {
None,
Text,
Separator,

16
Servers/WindowServer/WSWindowManager.cpp
View file

@ -389,7 +389,7 @@ void WSWindowManager::pick_new_active_window()
{
for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, [&](WSWindow& candidate) {
set_active_window(&candidate);
return IterationDecision::Abort;
return IterationDecision::Break;
});
}
@ -760,12 +760,12 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
if (!window.is_fullscreen() && m_keyboard_modifiers == Mod_Logo && event.type() == WSEvent::MouseDown && event.button() == MouseButton::Left) {
hovered_window = &window;
start_window_drag(window, event);
return IterationDecision::Abort;
return IterationDecision::Break;
}
if (window.is_resizable() && m_keyboard_modifiers == Mod_Logo && event.type() == WSEvent::MouseDown && event.button() == MouseButton::Right && !window.is_blocked_by_modal_window()) {
hovered_window = &window;
start_window_resize(window, event);
return IterationDecision::Abort;
return IterationDecision::Break;
}
}
// Well okay, let's see if we're hitting the frame or the window inside the frame.
@ -778,13 +778,13 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
auto translated_event = event.translated(-window.position());
deliver_mouse_event(window, translated_event);
}
return IterationDecision::Abort;
return IterationDecision::Break;
}
// We are hitting the frame, pass the event along to WSWindowFrame.
window.frame().on_mouse_event(event.translated(-window_frame_rect.location()));
event_window_with_frame = &window;
return IterationDecision::Abort;
return IterationDecision::Break;
});
if (event_window_with_frame != m_resize_candidate.ptr())
@ -815,7 +815,7 @@ bool WSWindowManager::any_opaque_window_contains_rect(const Rect& rect)
}
if (window.frame().rect().contains(rect)) {
found_containing_window = true;
return IterationDecision::Abort;
return IterationDecision::Break;
}
return IterationDecision::Continue;
});
@ -843,7 +843,7 @@ bool WSWindowManager::any_opaque_window_above_this_one_contains_rect(const WSWin
return IterationDecision::Continue;
if (window.frame().rect().contains(rect)) {
found_containing_window = true;
return IterationDecision::Abort;
return IterationDecision::Break;
}
return IterationDecision::Continue;
});
@ -1056,7 +1056,7 @@ Rect WSWindowManager::maximized_window_rect(const WSWindow& window) const
// Subtract taskbar window height if present
const_cast<WSWindowManager*>(this)->for_each_visible_window_of_type_from_back_to_front(WSWindowType::Taskbar, [&rect](WSWindow& taskbar_window) {
rect.set_height(rect.height() - taskbar_window.height());
return IterationDecision::Abort;
return IterationDecision::Break;
});
return rect;

55
Servers/WindowServer/WSWindowManager.h
View file

@ -29,8 +29,7 @@ class WSWindowSwitcher;
class GraphicsBitmap;
class WSButton;
enum class ResizeDirection
{
enum class ResizeDirection {
None,
Left,
UpLeft,
@ -268,12 +267,12 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_back_to_
do_highlight_window_at_end = true;
continue;
}
if (callback(*window) == IterationDecision::Abort)
return IterationDecision::Abort;
if (callback(*window) == IterationDecision::Break)
return IterationDecision::Break;
}
if (do_highlight_window_at_end) {
if (callback(*m_highlight_window) == IterationDecision::Abort)
return IterationDecision::Abort;
if (callback(*m_highlight_window) == IterationDecision::Break)
return IterationDecision::Break;
}
return IterationDecision::Continue;
}
@ -281,14 +280,14 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_back_to_
template<typename Callback>
IterationDecision WSWindowManager::for_each_visible_window_from_back_to_front(Callback callback)
{
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Normal, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Taskbar, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Tooltip, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Menu, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Normal, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Taskbar, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Tooltip, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Menu, callback) == IterationDecision::Break)
return IterationDecision::Break;
return for_each_visible_window_of_type_from_back_to_front(WSWindowType::WindowSwitcher, callback);
}
@ -296,8 +295,8 @@ template<typename Callback>
IterationDecision WSWindowManager::for_each_visible_window_of_type_from_front_to_back(WSWindowType type, Callback callback, bool ignore_highlight)
{
if (!ignore_highlight && m_highlight_window && m_highlight_window->type() == type && m_highlight_window->is_visible()) {
if (callback(*m_highlight_window) == IterationDecision::Abort)
return IterationDecision::Abort;
if (callback(*m_highlight_window) == IterationDecision::Break)
return IterationDecision::Break;
}
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
@ -309,8 +308,8 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_front_to
continue;
if (!ignore_highlight && window == m_highlight_window)
continue;
if (callback(*window) == IterationDecision::Abort)
return IterationDecision::Abort;
if (callback(*window) == IterationDecision::Break)
return IterationDecision::Break;
}
return IterationDecision::Continue;
}
@ -318,14 +317,14 @@ IterationDecision WSWindowManager::for_each_visible_window_of_type_from_front_to
template<typename Callback>
IterationDecision WSWindowManager::for_each_visible_window_from_front_to_back(Callback callback)
{
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::WindowSwitcher, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Menu, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Taskbar, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Tooltip, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::WindowSwitcher, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Menu, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Taskbar, callback) == IterationDecision::Break)
return IterationDecision::Break;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Tooltip, callback) == IterationDecision::Break)
return IterationDecision::Break;
return for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback);
}
@ -335,7 +334,7 @@ void WSWindowManager::for_each_window_listening_to_wm_events(Callback callback)
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
if (!window->listens_to_wm_events())
continue;
if (callback(*window) == IterationDecision::Abort)
if (callback(*window) == IterationDecision::Break)
return;
}
}
@ -344,7 +343,7 @@ template<typename Callback>
void WSWindowManager::for_each_window(Callback callback)
{
for (auto* window = m_windows_in_order.tail(); window; window = window->prev()) {
if (callback(*window) == IterationDecision::Abort)
if (callback(*window) == IterationDecision::Break)
return;
}
}

3
Servers/WindowServer/WSWindowType.h
View file

@ -1,7 +1,6 @@
#pragma once
enum class WSWindowType
{
enum class WSWindowType {
Invalid = 0,
Normal,
Menu,