Skip to content

Commit 4838fbe

Browse files
committed
Use design background size for event button
Commit 9c67d86 does not account for Waifu2X, but I don't want to fix this logic. The position of the event button in the official launcher is hardcoded with a fixed offset, so there's no need for us to scale it based on the background image size.
1 parent a47415d commit 4838fbe

4 files changed

Lines changed: 4 additions & 33 deletions

File tree

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.Loaders.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -275,18 +275,11 @@ private void SpawnImageLayer(Uri? overlayFilePath,
275275
converter: StaticConverter<InverseBooleanConverter>.Shared);
276276

277277
layerElement.ImageLoaded += LayerElementOnLoaded;
278-
layerElement.CanvasSizeChanged += LayerElementCanvasSizeChanged;
279278
PresenterGrid?.Children.Add(layerElement);
280279

281280
layerElement.Tag = isVideo;
282281
}
283282

284-
private void LayerElementCanvasSizeChanged(LayeredBackgroundImage layerElement, Size size)
285-
{
286-
CurrentElementWidth = size.Width;
287-
CurrentElementHeight = size.Height;
288-
}
289-
290283
private void LayerElementOnLoaded(LayeredBackgroundImage layerElement)
291284
{
292285
layerElement.ImageLoaded -= LayerElementOnLoaded;
@@ -297,10 +290,6 @@ private void LayerElementOnLoaded(LayeredBackgroundImage layerElement)
297290
foreach (UIElement element in elementToRemove)
298291
{
299292
PresenterGrid?.Children.Remove(element);
300-
if (element is LayeredBackgroundImage asLayeredImage)
301-
{
302-
asLayeredImage.CanvasSizeChanged -= LayerElementCanvasSizeChanged;
303-
}
304293
}
305294

306295
if (CurrentIsEnableBackgroundAutoPlay && WindowUtility.CurrentWindowIsVisible)

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.cs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -302,25 +302,9 @@ private set
302302
}
303303
}
304304

305-
public double CurrentElementWidth
306-
{
307-
get;
308-
set
309-
{
310-
field = value;
311-
OnPropertyChanged();
312-
}
313-
} = 2560d;
305+
public double DesignWidth => 2560d;
314306

315-
public double CurrentElementHeight
316-
{
317-
get;
318-
set
319-
{
320-
field = value;
321-
OnPropertyChanged();
322-
}
323-
} = 1440d;
307+
public double DesignHeight => 1440d;
324308

325309
/// <summary>
326310
/// The collection of image context sources.<br/><br/>

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@
184184
<Grid x:Name="ImageEventImgContainerGrid"
185185
DataContext="{x:Bind CurrentBackgroundManager, Mode=OneWay}"
186186
Visibility="{Binding CurrentSelectedBackgroundContext.IsCustom, Mode=OneWay, Converter={StaticResource InverseBooleanVisibilityConverter}}">
187-
<Grid Width="{Binding CurrentElementWidth, Mode=OneWay}"
188-
Height="{Binding CurrentElementHeight, Mode=OneWay}"
187+
<Grid Width="{Binding DesignWidth, Mode=OneWay}"
188+
Height="{Binding DesignHeight, Mode=OneWay}"
189189
HorizontalAlignment="Center"
190190
VerticalAlignment="Center">
191191
<c:NonFaultyImageEx

CollapseLauncher/XAMLs/Theme/CustomControls/LayeredBackgroundImage.Events.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ namespace CollapseLauncher.XAMLs.Theme.CustomControls;
1818
public partial class LayeredBackgroundImage
1919
{
2020
public event Action<LayeredBackgroundImage>? ImageLoaded;
21-
public event Action<LayeredBackgroundImage, Size>? CanvasSizeChanged;
2221

2322
#region Fields
2423

@@ -407,7 +406,6 @@ private void NotifyImageLoaded()
407406

408407
SetValue(CanvasWidthProperty, size.Width);
409408
SetValue(CanvasHeightProperty, size.Height);
410-
CanvasSizeChanged?.Invoke(this, size);
411409
}
412410

413411
private void NotifyVideoLoaded(MediaPlayer sender, object args)

0 commit comments

Comments
 (0)