lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-06-06 12:58:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix group layers may not contains left, top, width, height

Browse Source
This commit is contained in:
lifegpc
2026-02-03 21:30:42 +08:00
parent 73fb288692
commit b094defc65
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/scripts/emote/pimg.rs
View File

@@ -142,18 +142,25 @@ impl<'a> PImgLayer<'a> {
let name = data["name"]
.as_str()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid name"))?;
let left = data["left"]
.as_u32()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid left"))?;
let top = data["top"]
.as_u32()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid top"))?;
let width = data["width"]
.as_u32()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid width"))?;
let height = data["height"]
.as_u32()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid height"))?;
let left = data["left"].as_u32();
let top = data["top"].as_u32();
let width = data["width"].as_u32();
let height = data["height"].as_u32();
let (left, top, width, height) = if layer_type != 0 {
(
left.unwrap_or(0),
top.unwrap_or(0),
width.unwrap_or(0),
height.unwrap_or(0),
)
} else {
(
left.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid left"))?,
top.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid top"))?,
width.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid width"))?,
height.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid height"))?,
)
};
let opacity = data["opacity"]
.as_u8()
.ok_or_else(|| anyhow::anyhow!("Layer does not have a valid opacity"))?;