Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 5670ee1

Browse files
committed
clean up and set initial visibility to collapsed
1 parent e9c4772 commit 5670ee1

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
</UserControl.Resources>
4242

4343
<DockPanel>
44-
<StackPanel Margin="6,9,9,5"
44+
<control:ErrorStrip x:Name="ErrorMessage" Message="{Binding ErrorMessage}" VerticalAlignment="Top" DockPanel.Dock="Top"></control:ErrorStrip>
45+
<StackPanel Margin="6,9,9,5"
4546
DockPanel.Dock="Top"
4647
Orientation="Horizontal">
47-
<control:ErrorStrip x:Name="ErrorMessage" Message="{Binding ErrorMessage}" VerticalAlignment="Top"></control:ErrorStrip>
4848
<TextBlock Margin="0,-5,0,0"
4949
FontSize="14.7"
5050
FontWeight="SemiBold"

src/GitHub.VisualStudio/UI/Views/GitHubPaneView.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using GitHub.Exports;
33
using GitHub.UI;
44
using GitHub.ViewModels;
5+
using System.Windows;
56
using ReactiveUI;
67
using GitHub.Services;
78
using System.Windows.Threading;
@@ -25,13 +26,12 @@ public GitHubPaneView(INotificationDispatcher notifications)
2526
this.InitializeComponent();
2627
this.WhenActivated(d =>
2728
{
29+
ErrorMessage.Visibility = Visibility.Collapsed;
2830
d(notifications.Listen()
2931
.Where(n => n.Type == Notification.NotificationType.Error)
3032
.ObserveOnDispatcher(DispatcherPriority.Normal)
3133
.Subscribe(n =>
3234
{
33-
//errorMessage.Visibility = Visibility.Visible;
34-
// errorMessage = n.Message;
3535
ErrorMessage.Message = n.Message;
3636
}));
3737
});

src/GitHub.VisualStudio/UI/Views/GitHubPaneViewModel.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@ public override void Initialize(IServiceProvider serviceProvider)
9292
base.Initialize(serviceProvider);
9393

9494
hosts.WhenAnyValue(x => x.IsLoggedInToAnyHost).Subscribe(_ => Reload().Forget());
95-
96-
97-
ErrorMessage = "testing";
9895
}
9996

10097
public void Initialize([AllowNull] ViewWithData data)

src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ public PullRequestCreationView()
2222
{
2323
d(ViewModel.CancelCommand.Subscribe(_ => NotifyCancel()));
2424
d(ViewModel.CreatePullRequest.Subscribe(_ => NotifyDone()));
25-
26-
//ErrorMessage.Message = "testing the error message";
27-
2825
});
2926
}
3027
}

0 commit comments

Comments
 (0)