Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion App/Views/DirectoryPickerWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
MinWidth="400" MinHeight="600">

<Window.SystemBackdrop>
<DesktopAcrylicBackdrop />
<MicaBackdrop/>
</Window.SystemBackdrop>

<Frame x:Name="RootFrame" />
Expand Down
2 changes: 0 additions & 2 deletions App/Views/DirectoryPickerWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ public DirectoryPickerWindow(DirectoryPickerViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);

SystemBackdrop = new DesktopAcrylicBackdrop();

viewModel.Initialize(this, DispatcherQueue);
RootFrame.Content = new DirectoryPickerMainPage(viewModel);

Expand Down
2 changes: 1 addition & 1 deletion App/Views/FileSyncListWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
MinWidth="1000" MinHeight="300">

<Window.SystemBackdrop>
<DesktopAcrylicBackdrop />
<MicaBackdrop/>
</Window.SystemBackdrop>

<Frame x:Name="RootFrame" />
Expand Down
2 changes: 0 additions & 2 deletions App/Views/FileSyncListWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public FileSyncListWindow(FileSyncListViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);

SystemBackdrop = new DesktopAcrylicBackdrop();

ViewModel.Initialize(this, DispatcherQueue);
RootFrame.Content = new FileSyncListMainPage(ViewModel);

Expand Down
3 changes: 1 addition & 2 deletions App/Views/Pages/DirectoryPickerMainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
xmlns:converters="using:Coder.Desktop.App.Converters"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
mc:Ignorable="d">

<Grid>
<Grid
Expand Down
3 changes: 1 addition & 2 deletions App/Views/Pages/FileSyncListMainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
xmlns:converters="using:Coder.Desktop.App.Converters"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
mc:Ignorable="d">

<Grid>
<Grid
Expand Down
4 changes: 2 additions & 2 deletions App/Views/Pages/SettingsMainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
xmlns:ui="using:CommunityToolkit.WinUI"
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
mc:Ignorable="d">

<Page.Resources>
<!-- Spacing between cards -->
<x:Double x:Key="SettingsCardSpacing">4</x:Double>
Expand Down
3 changes: 1 addition & 2 deletions App/Views/Pages/SignInTokenPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
mc:Ignorable="d">

<StackPanel
Orientation="Vertical"
Expand Down
3 changes: 1 addition & 2 deletions App/Views/Pages/SignInUrlPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
mc:Ignorable="d">

<StackPanel
Orientation="Vertical"
Expand Down
9 changes: 7 additions & 2 deletions App/Views/Pages/TrayWindowMainPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,18 @@
<DataTemplate x:DataType="viewModels:AgentAppViewModel">
<HyperlinkButton
x:Name="AppButton"
Padding="6"
Margin="0"
Padding="4"
Margin="2"
Command="{x:Bind OpenAppCommand}"
CommandParameter="{Binding ElementName=AppButton}"
Width="34"
Height="34"

ToolTipService.ToolTip="{x:Bind Details}">
<HyperlinkButton.Resources>
<SolidColorBrush x:Key="HyperlinkButtonBackground" Color="#1F000000"/>
<SolidColorBrush x:Key="HyperlinkButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
</HyperlinkButton.Resources>

<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Image
Expand Down
2 changes: 1 addition & 1 deletion App/Views/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
MinWidth="600" MinHeight="350">

<Window.SystemBackdrop>
<DesktopAcrylicBackdrop />
<MicaBackdrop/>
</Window.SystemBackdrop>

<Frame x:Name="RootFrame" />
Expand Down
2 changes: 0 additions & 2 deletions App/Views/SettingsWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public SettingsWindow(SettingsViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);

SystemBackdrop = new DesktopAcrylicBackdrop();

RootFrame.Content = new SettingsMainPage(ViewModel);

this.CenterOnScreen();
Expand Down
2 changes: 1 addition & 1 deletion App/Views/SignInWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Title="Sign in to Coder">

<Window.SystemBackdrop>
<DesktopAcrylicBackdrop />
<MicaBackdrop/>
</Window.SystemBackdrop>

<controls:SizedFrame x:Name="RootFrame" />
Expand Down
1 change: 0 additions & 1 deletion App/Views/SignInWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public SignInWindow(SignInViewModel viewModel)
{
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);
SystemBackdrop = new DesktopAcrylicBackdrop();
RootFrame.SizeChanged += RootFrame_SizeChanged;

_signInUrlPage = new SignInUrlPage(this, viewModel);
Expand Down
4 changes: 0 additions & 4 deletions App/Views/TrayWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Windows.Graphics;
using Windows.System;
Expand Down Expand Up @@ -60,7 +58,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan

InitializeComponent();
AppWindow.Hide();
SystemBackdrop = new DesktopAcrylicBackdrop();
Activated += Window_Activated;
RootFrame.SizeChanged += RootFrame_SizeChanged;

Expand Down Expand Up @@ -118,7 +115,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
};
}


private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
SyncSessionControllerStateModel syncSessionModel)
{
Expand Down