Skip to content

Fixed app crash #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2020
Merged

Fixed app crash #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a35f4b
Fixed app crash
tsvietOK Apr 30, 2020
d1f3c74
Merge branch 'develop' into theme-fix
tsvietOK May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Files/Files.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -149,7 +149,7 @@
<Compile Include="Dialogs\ConfirmDeleteDialog.xaml.cs">
<DependentUpon>ConfirmDeleteDialog.xaml</DependentUpon>
</Compile>
<Compile Include="Helpers\AppTheme.cs" />
<Compile Include="Helpers\AcrylicTheme.cs" />
<Compile Include="Helpers\DispatcherHelper.cs" />
<Compile Include="Helpers\ItemsDataTemplateSelector.cs" />
<Compile Include="Helpers\NaturalStringComparer.cs" />
Expand Down
18 changes: 2 additions & 16 deletions Files/Helpers/AppTheme.cs → Files/Helpers/AcrylicTheme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,12 @@

namespace Files.Helpers
{
public class AppTheme : INotifyPropertyChanged
public class AcrylicTheme : INotifyPropertyChanged
{
private double? _TintLuminosityOpacity;
private Color _FallbackColor;
private Color _TintColor;
private double _TintOpacity;

public double? TintLuminosityOpacity
{
get { return _TintLuminosityOpacity; }
set
{
_TintLuminosityOpacity = value;
NotifyPropertyChanged("TintLuminosityOpacity");
}
}

public Color FallbackColor
{
get { return _FallbackColor; }
Expand Down Expand Up @@ -59,29 +48,26 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}

public AppTheme()
public AcrylicTheme()
{
}

public void SetDefaultTheme()
{
TintLuminosityOpacity = 0.9;
FallbackColor = (Color)Application.Current.Resources["SystemChromeMediumLowColor"];
TintColor = (Color)Application.Current.Resources["SystemAltHighColor"];
TintOpacity = 0.9;
}

public void SetLightTheme()
{
TintLuminosityOpacity = 0.9;
FallbackColor = Color.FromArgb(255, 242, 242, 242);
TintColor = Colors.White;
TintOpacity = 0.9;
}

public void SetDarkTheme()
{
TintLuminosityOpacity = 0.9;
FallbackColor = Color.FromArgb(255, 43, 43, 43);
TintColor = Colors.Black;
TintOpacity = 0.7;
Expand Down
8 changes: 4 additions & 4 deletions Files/Helpers/ThemeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static ElementTheme RootTheme

public static void Initialize()
{
App.AppSettings.AppTheme = new AppTheme();
App.AppSettings.AcrylicTheme = new AcrylicTheme();

// Set TitleBar background color
_TitleBar = ApplicationView.GetForCurrentView().TitleBar;
Expand Down Expand Up @@ -110,19 +110,19 @@ public static void UpdateTheme()
switch (RootTheme)
{
case ElementTheme.Default:
App.AppSettings.AppTheme.SetDefaultTheme();
App.AppSettings.AcrylicTheme.SetDefaultTheme();
_TitleBar.ButtonHoverBackgroundColor = (Color)Application.Current.Resources["SystemBaseLowColor"];
_TitleBar.ButtonForegroundColor = (Color)Application.Current.Resources["SystemBaseHighColor"];
break;

case ElementTheme.Light:
App.AppSettings.AppTheme.SetLightTheme();
App.AppSettings.AcrylicTheme.SetLightTheme();
_TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 0, 0, 0);
_TitleBar.ButtonForegroundColor = Colors.Black;
break;

case ElementTheme.Dark:
App.AppSettings.AppTheme.SetDarkTheme();
App.AppSettings.AcrylicTheme.SetDarkTheme();
_TitleBar.ButtonHoverBackgroundColor = Color.FromArgb(51, 255, 255, 255);
_TitleBar.ButtonForegroundColor = Colors.White;
break;
Expand Down
8 changes: 4 additions & 4 deletions Files/UserControls/ModernSidebar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@
OpenPaneLength="{TemplateBinding OpenPaneLength}">
<SplitView.PaneBackground>
<AcrylicBrush
Windows10version1903:TintLuminosityOpacity="{x:Bind local1:App.AppSettings.AppTheme.TintLuminosityOpacity, Mode=OneWay}"
Windows10version1903:TintLuminosityOpacity="0.9"
BackgroundSource="HostBackdrop"
FallbackColor="{x:Bind local1:App.AppSettings.AppTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local1:App.AppSettings.AppTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local1:App.AppSettings.AppTheme.TintOpacity, Mode=OneWay}"
FallbackColor="{x:Bind local1:App.AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local1:App.AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local1:App.AppSettings.AcrylicTheme.TintOpacity, Mode=OneWay}"
AlwaysUseFallback="{x:Bind local1:App.AppSettings.AcrylicEnabled, Mode=OneWay}" />
</SplitView.PaneBackground>
<SplitView.Pane>
Expand Down
2 changes: 1 addition & 1 deletion Files/View Models/SettingsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public bool AcrylicEnabled
ThemeModeChanged?.Invoke(this, EventArgs.Empty);
});

public AppTheme AppTheme { get; set; }
public AcrylicTheme AcrylicTheme { get; set; }

public Int32 LayoutMode
{
Expand Down
8 changes: 4 additions & 4 deletions Files/Views/InstanceTabsView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
mc:Ignorable="d">
<Page.Background>
<AcrylicBrush
Windows10version1903:TintLuminosityOpacity="{x:Bind local:App.AppSettings.AppTheme.TintLuminosityOpacity, Mode=OneWay}"
Windows10version1903:TintLuminosityOpacity="0.9"
BackgroundSource="HostBackdrop"
FallbackColor="{x:Bind local:App.AppSettings.AppTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local:App.AppSettings.AppTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local:App.AppSettings.AppTheme.TintOpacity, Mode=OneWay}"
FallbackColor="{x:Bind local:App.AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local:App.AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local:App.AppSettings.AcrylicTheme.TintOpacity, Mode=OneWay}"
AlwaysUseFallback="{x:Bind local:App.AppSettings.AcrylicEnabled, Mode=OneWay}" />
</Page.Background>

Expand Down
8 changes: 4 additions & 4 deletions Files/Views/Pages/Properties.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
RequestedTheme="{x:Bind local1:ThemeHelper.RootTheme}">
<Page.Background>
<AcrylicBrush
Windows10version1903:TintLuminosityOpacity="{x:Bind local:App.AppSettings.AppTheme.TintLuminosityOpacity, Mode=OneWay}"
Windows10version1903:TintLuminosityOpacity="0.9"
BackgroundSource="HostBackdrop"
FallbackColor="{x:Bind local:App.AppSettings.AppTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local:App.AppSettings.AppTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local:App.AppSettings.AppTheme.TintOpacity, Mode=OneWay}"
FallbackColor="{x:Bind local:App.AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
TintColor="{x:Bind local:App.AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
TintOpacity="{x:Bind local:App.AppSettings.AcrylicTheme.TintOpacity, Mode=OneWay}"
AlwaysUseFallback="{x:Bind local:App.AppSettings.AcrylicEnabled, Mode=OneWay}" />
</Page.Background>
<Grid>
Expand Down