mirror of
https://github.com/Zenithsiz/zsw.git
synced 2026-02-03 17:52:15 +00:00
Panel shaders are now mandatory.
This commit is contained in:
parent
1322d17148
commit
db4528d876
@ -8,3 +8,7 @@ geometry = "960x1080+2880+0"
|
||||
[state]
|
||||
duration = 5.0
|
||||
fade_duration = 1.0
|
||||
|
||||
[shader]
|
||||
type = "fade"
|
||||
fade = "basic"
|
||||
|
||||
@ -4,3 +4,7 @@ geometry = "1366x768+0+0"
|
||||
[state]
|
||||
duration = 5.0
|
||||
fade_duration = 1.0
|
||||
|
||||
[shader]
|
||||
type = "fade"
|
||||
fade = "basic"
|
||||
|
||||
@ -62,11 +62,7 @@ impl Panels {
|
||||
|
||||
// Finally convert it
|
||||
let geometries = panel.geometries.into_iter().map(|geometry| geometry.geometry).collect();
|
||||
// TODO: Is this a good default?
|
||||
let panel_shader = panel
|
||||
.shader
|
||||
.unwrap_or(ser::PanelShader::Fade(ser::PanelShaderFade::Out { strength: 1.5 }));
|
||||
let state = match panel_shader {
|
||||
let state = match panel.shader {
|
||||
ser::PanelShader::None { background_color } =>
|
||||
PanelState::None(PanelNoneState::new(background_color)),
|
||||
ser::PanelShader::Fade(fade) => PanelState::Fade(PanelFadeState::new(
|
||||
|
||||
@ -15,8 +15,7 @@ pub struct Panel {
|
||||
pub state: PanelState,
|
||||
|
||||
/// Shader
|
||||
#[serde(default)]
|
||||
pub shader: Option<PanelShader>,
|
||||
pub shader: PanelShader,
|
||||
}
|
||||
|
||||
/// Serialized panel geometry
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user