Skip to content

Commit

Permalink
Add progress ring for gallery
Browse files Browse the repository at this point in the history
  • Loading branch information
NotYoojun committed Jul 8, 2024
1 parent b545ab0 commit dbad9bf
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@
Name="splashProgressRing"
Grid.Row="2"
Grid.Column="1"
Width="20"
HorizontalAlignment="Center"
IsActive="True"
Visibility="Collapsed" />
/>
</Grid>
</Window>
1 change: 1 addition & 0 deletions source/iNKORE.UI.WPF.Modern/Controls/SimpleStackPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace iNKORE.UI.WPF.Modern.Controls
{
// I was going to include this, but i found out that I can't reference to the new SImpleStackPanel, so I have to exclude it from the project.
[Obsolete("We moved this control, please use iNKORE.UI.WPF.Controls.SimpleStackPanel from iNKORE.UI.WPF instead.")]
public class SimpleStackPanel : SimpleStackPanelBase
{
Expand Down
8 changes: 4 additions & 4 deletions source/iNKORE.UI.WPF.Modern/Helpers/Styles/SnapLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public class SnapLayout

private TitleBarButton _button;

private string _hoverColorKey;
private string _pressedColorKey;
//private string _hoverColorKey;
//private string _pressedColorKey;

public Button Target { get { return _button; } }

Expand Down Expand Up @@ -210,8 +210,8 @@ private void SetHoverColor()
//_hoverColor = (SolidColorBrush)UIApplication.Current.FindResource("SystemControlHighlightListLowBrush") ?? new SolidColorBrush(Color.FromArgb(21, 255, 255, 255));
//_pressedColor = (SolidColorBrush)UIApplication.Current.FindResource("SystemControlHighlightListMediumBrush") ?? new SolidColorBrush(Color.FromArgb(50, 0, 0, 0));

_hoverColorKey = "SystemControlHighlightListLowBrush";
_pressedColorKey = "SystemControlHighlightListMediumBrush";
////_hoverColorKey = "SystemControlHighlightListLowBrush";
////_pressedColorKey = "SystemControlHighlightListMediumBrush";
}

}
Expand Down
4 changes: 4 additions & 0 deletions source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
<Page Remove="Common\VisualStates\**" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Controls\SimpleStackPanel.cs" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="iNKORE.UI.WPF.Modern.Controls" />
</ItemGroup>
Expand Down

0 comments on commit dbad9bf

Please sign in to comment.