timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

change watermark width and margins to allow decimals (#2167)

Browse Source
This commit is contained in:
Jason Dove
2025-07-18 21:28:32 +00:00
committed by GitHub
parent e0cef62969
commit c953176cee
15 changed files with 11851 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV/Pages/WatermarkEditor.razor
+2 -1
View File
@@ -113,7 +113,8 @@
<div class="d-flex">
<MudText>Width</MudText>
</div>
<MudTextField For="@(() => _model.Width)"
<MudTextField @bind-Value="_model.Width"
For="@(() => _model.Width)"
Adornment="Adornment.End"
AdornmentText="%"
Disabled="@(_model.Mode == ChannelWatermarkMode.None || _model.Size == WatermarkSize.ActualSize)"
ErsatzTV/Validators/WatermarkEditViewModelValidator.cs
+6 -6
View File
@@ -18,19 +18,19 @@ public class WatermarkEditViewModelValidator : AbstractValidator<WatermarkEditVi
.When(vm => vm.ImageSource == ChannelWatermarkImageSource.Custom);
RuleFor(x => x.Width)
.GreaterThan(0)
.LessThanOrEqualTo(100)
.GreaterThan(0.0)
.LessThanOrEqualTo(100.0)
.When(vm => vm.Mode != ChannelWatermarkMode.None &&
vm.Size == WatermarkSize.Scaled);
RuleFor(x => x.HorizontalMargin)
.GreaterThanOrEqualTo(0)
.LessThanOrEqualTo(50)
.GreaterThanOrEqualTo(0.0)
.LessThanOrEqualTo(50.0)
.When(vm => vm.Mode != ChannelWatermarkMode.None);
RuleFor(x => x.VerticalMargin)
.GreaterThanOrEqualTo(0)
.LessThanOrEqualTo(50)
.GreaterThanOrEqualTo(0.0)
.LessThanOrEqualTo(50.0)
.When(vm => vm.Mode != ChannelWatermarkMode.None);
RuleFor(x => x.DurationSeconds)
ErsatzTV/ViewModels/WatermarkEditViewModel.cs
+3 -3
View File
@@ -36,9 +36,9 @@ public class WatermarkEditViewModel
public ChannelWatermarkImageSource ImageSource { get; set; }
public WatermarkLocation Location { get; set; }
public WatermarkSize Size { get; set; }
public int Width { get; set; }
public int HorizontalMargin { get; set; }
public int VerticalMargin { get; set; }
public double Width { get; set; }
public double HorizontalMargin { get; set; }
public double VerticalMargin { get; set; }
public int FrequencyMinutes { get; set; }
public int DurationSeconds { get; set; }
public int Opacity { get; set; }