- Notifications
You must be signed in to change notification settings - Fork3
feat: add workspace app icons to tray window#86
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
15 commits Select commitHold shift + click to select a range
1d3d9df
feat: add workspace app icons to tray window
deansheatherc6d45ea
fix various warnings
deansheather6b1b4cb
comments and ModelMergeTest
deansheather0fefc8c
ModelMerge comments
deansheather8879191
redo of IconUrl and ImageSource
deansheather0306938
display apps
deansheatherc5f360a
only one expanded at a time
deansheatherb215ba0
fix startup lock bug
deansheatheref8284f
auto expand first agent
deansheather5a2ffc9
Merge branch 'main' into dean/app-buttons
deansheatherb3c2eaa
rework agent expand bubbling
deansheatherc4ef279
Merge branch 'main' into dean/app-buttons
deansheatherb31dd2e
fix fmt
deansheather4add8bc
Move Uuid => CoderSdk
deansheather22d0660
remove Uuid utils from Vpn.Proto
deansheatherFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
5 changes: 3 additions & 2 deletionsApp/App.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletionApp/App.xaml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletionsApp/Controls/ExpandChevron.xaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<UserControl | ||
x:Class="Coder.Desktop.App.Controls.ExpandChevron" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
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" | ||
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" | ||
mc:Ignorable="d"> | ||
<Grid> | ||
<AnimatedIcon | ||
Grid.Column="0" | ||
x:Name="ChevronIcon" | ||
Width="16" | ||
Height="16" | ||
Margin="0,0,8,0" | ||
RenderTransformOrigin="0.5, 0.5" | ||
Foreground="{x:Bind Foreground, Mode=OneWay}" | ||
HorizontalAlignment="Center" | ||
VerticalAlignment="Center" | ||
AnimatedIcon.State="NormalOff"> | ||
<animatedVisuals:AnimatedChevronRightDownSmallVisualSource /> | ||
<AnimatedIcon.FallbackIconSource> | ||
<FontIconSource Glyph="" /> | ||
</AnimatedIcon.FallbackIconSource> | ||
</AnimatedIcon> | ||
</Grid> | ||
</UserControl> |
19 changes: 19 additions & 0 deletionsApp/Controls/ExpandChevron.xaml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
using DependencyPropertyGenerator; | ||
using Microsoft.UI.Xaml.Controls; | ||
namespace Coder.Desktop.App.Controls; | ||
[DependencyProperty<bool>("IsOpen", DefaultValue = false)] | ||
public sealed partial class ExpandChevron : UserControl | ||
{ | ||
public ExpandChevron() | ||
{ | ||
InitializeComponent(); | ||
} | ||
partial void OnIsOpenChanged(bool oldValue, bool newValue) | ||
{ | ||
var newState = newValue ? "NormalOn" : "NormalOff"; | ||
AnimatedIcon.SetState(ChevronIcon, newState); | ||
} | ||
} |
51 changes: 51 additions & 0 deletionsApp/Controls/ExpandContent.xaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<UserControl | ||
x:Class="Coder.Desktop.App.Controls.ExpandContent" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
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" | ||
xmlns:toolkit="using:CommunityToolkit.WinUI" | ||
mc:Ignorable="d"> | ||
<Grid x:Name="CollapsiblePanel" Opacity="0" Visibility="Collapsed" toolkit:UIElementExtensions.ClipToBounds="True"> | ||
<Grid.RenderTransform> | ||
<TranslateTransform x:Name="SlideTransform" Y="-10" /> | ||
</Grid.RenderTransform> | ||
<VisualStateManager.VisualStateGroups> | ||
<VisualStateGroup> | ||
<VisualState x:Name="ExpandedState"> | ||
<Storyboard> | ||
<DoubleAnimation | ||
Storyboard.TargetName="CollapsiblePanel" | ||
Storyboard.TargetProperty="Opacity" | ||
To="1" | ||
Duration="0:0:0.2" /> | ||
<DoubleAnimation | ||
Storyboard.TargetName="SlideTransform" | ||
Storyboard.TargetProperty="Y" | ||
To="0" | ||
Duration="0:0:0.2" /> | ||
</Storyboard> | ||
</VisualState> | ||
<VisualState x:Name="CollapsedState"> | ||
<Storyboard Completed="{x:Bind CollapseAnimation_Completed}"> | ||
<DoubleAnimation | ||
Storyboard.TargetName="CollapsiblePanel" | ||
Storyboard.TargetProperty="Opacity" | ||
To="0" | ||
Duration="0:0:0.2" /> | ||
<DoubleAnimation | ||
Storyboard.TargetName="SlideTransform" | ||
Storyboard.TargetProperty="Y" | ||
To="-10" | ||
Duration="0:0:0.2" /> | ||
</Storyboard> | ||
</VisualState> | ||
</VisualStateGroup> | ||
</VisualStateManager.VisualStateGroups> | ||
</Grid> | ||
</UserControl> |
39 changes: 39 additions & 0 deletionsApp/Controls/ExpandContent.xaml.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
using DependencyPropertyGenerator; | ||
using Microsoft.UI.Xaml; | ||
using Microsoft.UI.Xaml.Controls; | ||
using Microsoft.UI.Xaml.Markup; | ||
namespace Coder.Desktop.App.Controls; | ||
[ContentProperty(Name = nameof(Children))] | ||
[DependencyProperty<bool>("IsOpen", DefaultValue = false)] | ||
public sealed partial class ExpandContent : UserControl | ||
{ | ||
public UIElementCollection Children => CollapsiblePanel.Children; | ||
public ExpandContent() | ||
{ | ||
InitializeComponent(); | ||
} | ||
public void CollapseAnimation_Completed(object? sender, object args) | ||
{ | ||
// Hide the panel completely when the collapse animation is done. This | ||
// cannot be done with keyframes for some reason. | ||
// | ||
// Without this, the space will still be reserved for the panel. | ||
CollapsiblePanel.Visibility = Visibility.Collapsed; | ||
} | ||
partial void OnIsOpenChanged(bool oldValue, bool newValue) | ||
{ | ||
var newState = newValue ? "ExpandedState" : "CollapsedState"; | ||
// The animation can't set visibility when starting or ending the | ||
// animation. | ||
if (newValue) | ||
CollapsiblePanel.Visibility = Visibility.Visible; | ||
VisualStateManager.GoToState(this, newState, true); | ||
} | ||
} |
13 changes: 13 additions & 0 deletionsApp/Converters/DependencyObjectSelector.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletionsApp/Models/CredentialModel.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletionsApp/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
37 changes: 26 additions & 11 deletionsApp/Services/CredentialManager.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionApp/Services/RpcController.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletionApp/Services/UserNotifier.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -27,4 +27,3 @@ public Task ShowErrorNotification(string title, string message, CancellationToke | ||
return Task.CompletedTask; | ||
} | ||
} | ||
2 changes: 1 addition & 1 deletionApp/DisplayScale.cs → App/Utils/DisplayScale.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.