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

WindowServer+LibGfx: Move CursorParams to LibGfx

Browse source 
They will be used by MouseSettings in the next commit.
This commit is contained in:
Maciej Zygmanowski 2021-08-02 11:56:05 +02:00 • committed by Andreas Kling
parent 0363cd3d55
commit 3597b6eb9d
5 changed files with 145 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Services/WindowServer/Cursor.h
View file

@ -8,33 +8,11 @@
#include <AK/HashMap.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/CursorParams.h>
#include <LibGfx/StandardCursor.h>
namespace WindowServer {
class CursorParams {
friend class Cursor;
public:
static CursorParams parse_from_filename(const StringView&, const Gfx::IntPoint&);
CursorParams(const Gfx::IntPoint& hotspot)
: m_hotspot(hotspot)
{
}
CursorParams constrained(const Gfx::Bitmap&) const;
const Gfx::IntPoint& hotspot() const { return m_hotspot; }
unsigned frames() const { return m_frames; }
unsigned frame_ms() const { return m_frame_ms; }
private:
CursorParams() = default;
Gfx::IntPoint m_hotspot;
unsigned m_frames { 1 };
unsigned m_frame_ms { 0 };
bool m_have_hotspot { false };
};
class Cursor : public RefCounted<Cursor> {
public:
static RefPtr<Cursor> create(const StringView&, const StringView&);
@ -42,7 +20,7 @@ public:
static RefPtr<Cursor> create(Gfx::StandardCursor);
~Cursor() = default;
const CursorParams& params() const { return m_params; }
const Gfx::CursorParams& params() const { return m_params; }
const Gfx::Bitmap& bitmap(int scale_factor) const
{
auto it = m_bitmaps.find(scale_factor);
@ -69,13 +47,13 @@ public:
private:
Cursor() { }
Cursor(NonnullRefPtr<Gfx::Bitmap>&&, int, const CursorParams&);
Cursor(NonnullRefPtr<Gfx::Bitmap>&&, int, const Gfx::CursorParams&);
bool load(const StringView&, const StringView&);
void update_rect_if_animated();
HashMap<int, NonnullRefPtr<Gfx::Bitmap>> m_bitmaps;
CursorParams m_params;
Gfx::CursorParams m_params;
Gfx::IntRect m_rect;
};