Skip to content

Commit 0769a03

Browse files
committed
Merge branch 'master' of https://github.com/duke7553/files-uwp
2 parents 344a6ad + b6df291 commit 0769a03

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

Files UWP/FilesUWP.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>Files</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18327.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -290,7 +290,7 @@
290290
<None Include="Files_TemporaryKey.pfx" />
291291
</ItemGroup>
292292
<ItemGroup>
293-
<SDKReference Include="WindowsDesktop, Version=10.0.18327.0">
293+
<SDKReference Include="WindowsDesktop, Version=10.0.17763.0">
294294
<Name>Windows Desktop Extensions for the UWP</Name>
295295
</SDKReference>
296296
</ItemGroup>

Files UWP/MainPage.xaml.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,24 @@ public MainPage()
5353
PopulateNavViewWithExternalDrives();
5454
permissionBox = PermissionDialog;
5555

56+
//make the minimize, maximize and close button visible in light theme
57+
if (App.Current.RequestedTheme == ApplicationTheme.Dark)
58+
{
59+
titleBar.ButtonForegroundColor = Colors.White;
60+
}
61+
else if (App.Current.RequestedTheme == ApplicationTheme.Light)
62+
{
63+
titleBar.ButtonForegroundColor = Colors.Black;
64+
}
65+
66+
if (this.RequestedTheme == ElementTheme.Dark)
67+
{
68+
titleBar.ButtonForegroundColor = Colors.White;
69+
}
70+
else if (this.RequestedTheme == ElementTheme.Light)
71+
{
72+
titleBar.ButtonForegroundColor = Colors.Black;
73+
}
5674
}
5775

5876
public async void PopulateNavViewWithExternalDrives()

Launcher/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
55
</startup>
6-
</configuration>
6+
</configuration>

Launcher/Launcher.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<OutputType>Exe</OutputType>
99
<RootNamespace>Launcher</RootNamespace>
1010
<AssemblyName>Launcher</AssemblyName>
11-
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<Deterministic>true</Deterministic>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<PlatformTarget>AnyCPU</PlatformTarget>

0 commit comments

Comments
 (0)