diff --git a/Userland/Libraries/LibCore/MimeData.cpp b/Userland/Libraries/LibCore/MimeData.cpp index b296ffa32e..0dcccf426a 100644 --- a/Userland/Libraries/LibCore/MimeData.cpp +++ b/Userland/Libraries/LibCore/MimeData.cpp @@ -11,15 +11,6 @@ namespace Core { -Vector MimeData::formats() const -{ - Vector mime_types; - mime_types.ensure_capacity(m_data.size()); - for (auto& it : m_data) - mime_types.unchecked_append(it.key.to_deprecated_string()); - return mime_types; -} - Vector MimeData::urls() const { auto it = m_data.find("text/uri-list"sv); diff --git a/Userland/Libraries/LibCore/MimeData.h b/Userland/Libraries/LibCore/MimeData.h index 36c190002b..64b24df853 100644 --- a/Userland/Libraries/LibCore/MimeData.h +++ b/Userland/Libraries/LibCore/MimeData.h @@ -24,7 +24,7 @@ public: void set_data(String const& mime_type, ByteBuffer&& data) { m_data.set(mime_type, move(data)); } bool has_format(StringView mime_type) const { return m_data.contains(mime_type); } - Vector formats() const; + Vector formats() const { return m_data.keys(); } // Convenience helpers for "text/plain" bool has_text() const { return has_format("text/plain"sv); } diff --git a/Userland/Libraries/LibGUI/Application.cpp b/Userland/Libraries/LibGUI/Application.cpp index ada928fa6c..decb52d7dc 100644 --- a/Userland/Libraries/LibGUI/Application.cpp +++ b/Userland/Libraries/LibGUI/Application.cpp @@ -283,7 +283,7 @@ void Application::set_pending_drop_widget(Widget* widget) m_pending_drop_widget->update(); } -void Application::set_drag_hovered_widget_impl(Widget* widget, Gfx::IntPoint position, Vector mime_types) +void Application::set_drag_hovered_widget_impl(Widget* widget, Gfx::IntPoint position, Vector mime_types) { if (widget == m_drag_hovered_widget) return; diff --git a/Userland/Libraries/LibGUI/Application.h b/Userland/Libraries/LibGUI/Application.h index 2bf5b40ae6..dd3ca40451 100644 --- a/Userland/Libraries/LibGUI/Application.h +++ b/Userland/Libraries/LibGUI/Application.h @@ -78,7 +78,7 @@ public: Widget* pending_drop_widget() { return m_pending_drop_widget.ptr(); } Widget const* pending_drop_widget() const { return m_pending_drop_widget.ptr(); } - void set_drag_hovered_widget(Badge, Widget* widget, Gfx::IntPoint position = {}, Vector mime_types = {}) + void set_drag_hovered_widget(Badge, Widget* widget, Gfx::IntPoint position = {}, Vector mime_types = {}) { set_drag_hovered_widget_impl(widget, position, move(mime_types)); } @@ -106,7 +106,7 @@ private: void request_tooltip_show(); void tooltip_hide_timer_did_fire(); - void set_drag_hovered_widget_impl(Widget*, Gfx::IntPoint = {}, Vector = {}); + void set_drag_hovered_widget_impl(Widget*, Gfx::IntPoint = {}, Vector = {}); void set_pending_drop_widget(Widget*); OwnPtr m_event_loop; diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp index 601184ccb4..3d9dd27f0e 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp +++ b/Userland/Libraries/LibGUI/ConnectionToWindowServer.cpp @@ -259,7 +259,7 @@ void ConnectionToWindowServer::mouse_up(i32 window_id, Gfx::IntPoint mouse_posit Core::EventLoop::current().post_event(*window, make(Event::MouseUp, mouse_position, buttons, to_mouse_button(button), modifiers, wheel_delta_x, wheel_delta_y, wheel_raw_delta_x, wheel_raw_delta_y)); } -void ConnectionToWindowServer::mouse_move(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y, bool is_drag, Vector const& mime_types) +void ConnectionToWindowServer::mouse_move(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y, bool is_drag, Vector const& mime_types) { if (auto* window = Window::from_window_id(window_id)) { if (is_drag) diff --git a/Userland/Libraries/LibGUI/ConnectionToWindowServer.h b/Userland/Libraries/LibGUI/ConnectionToWindowServer.h index b5930a95b7..13283cbcbc 100644 --- a/Userland/Libraries/LibGUI/ConnectionToWindowServer.h +++ b/Userland/Libraries/LibGUI/ConnectionToWindowServer.h @@ -26,7 +26,7 @@ private: virtual void fast_greet(Vector const&, u32, u32, u32, Core::AnonymousBuffer const&, DeprecatedString const&, DeprecatedString const&, DeprecatedString const&, Vector const&, i32) override; virtual void paint(i32, Gfx::IntSize, Vector const&) override; - virtual void mouse_move(i32, Gfx::IntPoint, u32, u32, u32, i32, i32, i32, i32, bool, Vector const&) override; + virtual void mouse_move(i32, Gfx::IntPoint, u32, u32, u32, i32, i32, i32, i32, bool, Vector const&) override; virtual void mouse_down(i32, Gfx::IntPoint, u32, u32, u32, i32, i32, i32, i32) override; virtual void mouse_double_click(i32, Gfx::IntPoint, u32, u32, u32, i32, i32, i32, i32) override; virtual void mouse_up(i32, Gfx::IntPoint, u32, u32, u32, i32, i32, i32, i32) override; diff --git a/Userland/Libraries/LibGUI/Event.h b/Userland/Libraries/LibGUI/Event.h index 1902889a06..82195b9d50 100644 --- a/Userland/Libraries/LibGUI/Event.h +++ b/Userland/Libraries/LibGUI/Event.h @@ -7,6 +7,7 @@ #pragma once +#include #include #include #include @@ -460,7 +461,7 @@ private: class DragEvent final : public Event { public: - DragEvent(Type type, Gfx::IntPoint position, Vector mime_types) + DragEvent(Type type, Gfx::IntPoint position, Vector mime_types) : Event(type) , m_position(position) , m_mime_types(move(mime_types)) @@ -468,11 +469,11 @@ public: } Gfx::IntPoint position() const { return m_position; } - Vector const& mime_types() const { return m_mime_types; } + Vector const& mime_types() const { return m_mime_types; } private: Gfx::IntPoint m_position; - Vector m_mime_types; + Vector m_mime_types; }; class DropEvent final : public Event { diff --git a/Userland/Libraries/LibGUI/FileSystemModel.cpp b/Userland/Libraries/LibGUI/FileSystemModel.cpp index 252015e3be..3fff552d49 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.cpp +++ b/Userland/Libraries/LibGUI/FileSystemModel.cpp @@ -787,7 +787,7 @@ ErrorOr FileSystemModel::column_name(int column) const VERIFY_NOT_REACHED(); } -bool FileSystemModel::accepts_drag(ModelIndex const& index, Vector const& mime_types) const +bool FileSystemModel::accepts_drag(ModelIndex const& index, Vector const& mime_types) const { if (!mime_types.contains_slow("text/uri-list"sv)) return false; diff --git a/Userland/Libraries/LibGUI/FileSystemModel.h b/Userland/Libraries/LibGUI/FileSystemModel.h index fa9535ac51..dccccab5c6 100644 --- a/Userland/Libraries/LibGUI/FileSystemModel.h +++ b/Userland/Libraries/LibGUI/FileSystemModel.h @@ -132,7 +132,7 @@ public: virtual ModelIndex parent_index(ModelIndex const&) const override; virtual ModelIndex index(int row, int column = 0, ModelIndex const& parent = ModelIndex()) const override; virtual StringView drag_data_type() const override { return "text/uri-list"sv; } - virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const override; + virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const override; virtual bool is_column_sortable(int column_index) const override { return column_index != Column::Icon; } virtual bool is_editable(ModelIndex const&) const override; virtual bool is_searchable() const override { return true; } diff --git a/Userland/Libraries/LibGUI/Model.cpp b/Userland/Libraries/LibGUI/Model.cpp index fa31bc91d1..f37904c5c1 100644 --- a/Userland/Libraries/LibGUI/Model.cpp +++ b/Userland/Libraries/LibGUI/Model.cpp @@ -63,7 +63,7 @@ ModelIndex Model::index(int row, int column, ModelIndex const&) const return create_index(row, column); } -bool Model::accepts_drag(ModelIndex const&, Vector const&) const +bool Model::accepts_drag(ModelIndex const&, Vector const&) const { return false; } diff --git a/Userland/Libraries/LibGUI/Model.h b/Userland/Libraries/LibGUI/Model.h index a2f038e74c..f9477a3a43 100644 --- a/Userland/Libraries/LibGUI/Model.h +++ b/Userland/Libraries/LibGUI/Model.h @@ -81,7 +81,7 @@ public: virtual bool is_searchable() const { return false; } virtual void set_data(ModelIndex const&, Variant const&) { } virtual int tree_column() const { return 0; } - virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const; + virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const; virtual Vector matches(StringView, unsigned = MatchesFlag::AllMatching, ModelIndex const& = ModelIndex()) { return {}; } virtual bool is_column_sortable([[maybe_unused]] int column_index) const { return true; } diff --git a/Userland/Libraries/LibGUI/SortingProxyModel.cpp b/Userland/Libraries/LibGUI/SortingProxyModel.cpp index 6357a16552..cd6c48d835 100644 --- a/Userland/Libraries/LibGUI/SortingProxyModel.cpp +++ b/Userland/Libraries/LibGUI/SortingProxyModel.cpp @@ -49,7 +49,7 @@ void SortingProxyModel::model_did_update(unsigned flags) update_sort(flags); } -bool SortingProxyModel::accepts_drag(ModelIndex const& proxy_index, Vector const& mime_types) const +bool SortingProxyModel::accepts_drag(ModelIndex const& proxy_index, Vector const& mime_types) const { return source().accepts_drag(map_to_source(proxy_index), mime_types); } diff --git a/Userland/Libraries/LibGUI/SortingProxyModel.h b/Userland/Libraries/LibGUI/SortingProxyModel.h index 84a3a35b9f..82eec947bb 100644 --- a/Userland/Libraries/LibGUI/SortingProxyModel.h +++ b/Userland/Libraries/LibGUI/SortingProxyModel.h @@ -34,7 +34,7 @@ public: virtual bool is_searchable() const override; virtual void set_data(ModelIndex const&, Variant const&) override; virtual Vector matches(StringView, unsigned = MatchesFlag::AllMatching, ModelIndex const& = ModelIndex()) override; - virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const override; + virtual bool accepts_drag(ModelIndex const&, Vector const& mime_types) const override; virtual bool is_column_sortable(int column_index) const override; diff --git a/Userland/Services/WindowServer/Event.h b/Userland/Services/WindowServer/Event.h index add4160076..b736dea293 100644 --- a/Userland/Services/WindowServer/Event.h +++ b/Userland/Services/WindowServer/Event.h @@ -114,7 +114,7 @@ public: int wheel_raw_delta_y() const { return m_wheel_raw_delta_y; } bool is_drag() const { return m_drag; } - Vector mime_types() const + Vector mime_types() const { if (!m_mime_data) return {}; diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc index 225248f679..aca0b8a7d7 100644 --- a/Userland/Services/WindowServer/WindowClient.ipc +++ b/Userland/Services/WindowServer/WindowClient.ipc @@ -6,7 +6,7 @@ endpoint WindowClient fast_greet(Vector screen_rects, u32 main_screen_index, u32 workspace_rows, u32 workspace_columns, Core::AnonymousBuffer theme_buffer, DeprecatedString default_font_query, DeprecatedString fixed_width_font_query, DeprecatedString window_title_font_query, Vector effects, i32 client_id) =| paint(i32 window_id, Gfx::IntSize window_size, Vector rects) =| - mouse_move(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y, bool is_drag, Vector mime_types) =| + mouse_move(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y, bool is_drag, Vector mime_types) =| mouse_down(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y) =| mouse_double_click(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y) =| mouse_up(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta_x, i32 wheel_delta_y, i32 wheel_raw_delta_x, i32 wheel_raw_delta_y) =|