render/cursor: Follow selected scale instead of wanted scale
This commit is contained in:
parent
f837b109d0
commit
abda6619ff
1 changed files with 6 additions and 1 deletions
|
|
@ -217,6 +217,10 @@ impl CursorStateInner {
|
||||||
.entry(shape)
|
.entry(shape)
|
||||||
.or_insert_with(|| Cursor::load(&self.cursor_theme, shape, self.cursor_size))
|
.or_insert_with(|| Cursor::load(&self.cursor_theme, shape, self.cursor_size))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn size(&self) -> u32 {
|
||||||
|
self.cursor_size
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load_cursor_theme() -> (CursorTheme, u32) {
|
pub fn load_cursor_theme() -> (CursorTheme, u32) {
|
||||||
|
|
@ -292,6 +296,7 @@ where
|
||||||
let frame = state
|
let frame = state
|
||||||
.get_named_cursor(current_cursor)
|
.get_named_cursor(current_cursor)
|
||||||
.get_image(integer_scale, time.as_millis());
|
.get_image(integer_scale, time.as_millis());
|
||||||
|
let actual_scale = (frame.size / state.size()).max(1);
|
||||||
|
|
||||||
let pointer_images = &mut state.image_cache;
|
let pointer_images = &mut state.image_cache;
|
||||||
let maybe_image =
|
let maybe_image =
|
||||||
|
|
@ -305,7 +310,7 @@ where
|
||||||
&frame.pixels_rgba,
|
&frame.pixels_rgba,
|
||||||
Fourcc::Argb8888,
|
Fourcc::Argb8888,
|
||||||
(frame.width as i32, frame.height as i32),
|
(frame.width as i32, frame.height as i32),
|
||||||
integer_scale as i32,
|
actual_scale as i32,
|
||||||
Transform::Normal,
|
Transform::Normal,
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue