Skip to content

Commit 9bfb44e

Browse files
committed
Fix view when statistic button pressed
I made it so that the statistics don't show up in the background and that the display is back to normal.
1 parent 55a4de9 commit 9bfb44e

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

app/Project Tracker/Project Tracker/MainWindow.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248

249249
<!-- Display window content -->
250250
<!-- The default view if there's no projects made yet -->
251-
<Grid x:Name="noProjectsGrid" Margin="345,115,0,209" Visibility="Hidden">
251+
<Grid x:Name="noProjectsGrid" Margin="345,115,0,209" Visibility="Visible">
252252
<Canvas x:Name="errorCanvas" HorizontalAlignment="Center" VerticalAlignment="Center" Height="45" Width="45" Margin="0,0,120,140">
253253
<Image Source="{StaticResource errorDrawingImage}" Height="45" Width="45" />
254254
</Canvas>
@@ -268,7 +268,7 @@
268268
<!-- The view if there is projects made -->
269269
<Grid Margin="345,0,0,0">
270270
<Canvas HorizontalAlignment="Left" VerticalAlignment="Top" Height="45" Width="45" Margin="75,31,0,0">
271-
<Image x:Name="displayingImage" Source="{StaticResource graphDrawingImage}" Height="45" Width="45" Visibility="Visible" PreviewMouseDown="displayingImage_PreviewMouseDown" Cursor="Hand" />
271+
<Image x:Name="displayingImage" Source="{StaticResource noIcon}" Height="45" Width="45" Visibility="Visible" PreviewMouseDown="displayingImage_PreviewMouseDown" Cursor="Hand" />
272272
</Canvas>
273273
<Canvas HorizontalAlignment="Right" VerticalAlignment="Top" Height="40" Width="40" Margin="0,45,45,0">
274274
<Image x:Name="settingsImage" Source="{StaticResource settingsDrawingImage}" Height="40" Width="40" Visibility="Hidden" PreviewMouseDown="settingsImage_PreviewMouseDown" Cursor="Hand" />
@@ -277,7 +277,7 @@
277277
<Image x:Name="folderImage" Source="{StaticResource folderDrawingImage}" Height="40" Width="40" Visibility="Hidden" PreviewMouseDown="folderImage_PreviewMouseDown" Cursor="Hand" />
278278
</Canvas>
279279

280-
<Label x:Name="displayingTitle" VerticalContentAlignment="Top" HorizontalAlignment="Left" Content="Project Tracker Statistics" FontSize="40" Margin="135,21,0,7" FontWeight="Medium" Visibility="Visible" />
280+
<Label x:Name="displayingTitle" VerticalContentAlignment="Top" HorizontalAlignment="Left" Content="" FontSize="40" Margin="135,21,0,7" FontWeight="Medium" Visibility="Visible" />
281281
<Border x:Name="changeTitleBorder" BorderBrush="#FF919191" BorderThickness="2" HorizontalAlignment="Left" Height="64" Margin="135,21,0,0" VerticalAlignment="Top" Width="500" Visibility="Hidden">
282282
<TextBox x:Name="changeTitleTextBox" TextWrapping="Wrap" Text="Project Tracker" FontSize="40" LostFocus="changeTitleTextBox_LostFocus" />
283283
</Border>
@@ -318,7 +318,7 @@
318318
</Grid>
319319

320320
<!-- The statistics menu -->
321-
<Grid x:Name="statisticsGrid" Margin="350,100,0,0">
321+
<Grid x:Name="statisticsGrid" Margin="350,100,0,0" Visibility="Hidden">
322322
<Label x:Name="creationDateLabel" Content="Date created: 6/9/2020" HorizontalAlignment="Left" Margin="20,20,0,0" VerticalAlignment="Top" FontSize="28"/>
323323
<Label x:Name="tasksMadeLabel" Content="Tasks created: 0" HorizontalAlignment="Left" Margin="20,90,0,0" VerticalAlignment="Top" FontSize="24"/>
324324
<Label x:Name="tasksCompletedLabel" Content="Tasks completed: 0" HorizontalAlignment="Left" Margin="20,125,0,0" VerticalAlignment="Top" FontSize="24"/>

app/Project Tracker/Project Tracker/MainWindow.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.ComponentModel;
55
using System.IO;
66
using System.Net;
7-
using System.Runtime.InteropServices;
87
using System.Text;
98
using System.Threading;
109
using System.Threading.Tasks;
@@ -1285,12 +1284,17 @@ private void OverallSettingsBorderMouseDown(object sender, MouseButtonEventArgs
12851284
}
12861285

12871286
private void ProjectStatisticsMouseDown(object sender, MouseButtonEventArgs e) {
1287+
statisticsGrid.Visibility = Visibility.Visible;
1288+
12881289
displayingTitle.Content = title += " Statistics";
12891290
displayingImage.Source = (ImageSource)TryFindResource("graphDrawingImage");
12901291

12911292
addItemBorder.Visibility = Visibility.Hidden;
12921293
settingsImage.Visibility = Visibility.Hidden;
12931294
folderImage.Visibility = Visibility.Hidden;
1295+
scrollviewerGrid.Visibility = Visibility.Hidden;
1296+
completeGrid.Visibility = Visibility.Hidden;
1297+
noProjectsGrid.Visibility = Visibility.Hidden;
12941298

12951299
creationDateLabel.Content = "Date created: " + dateCreated;
12961300
tasksMadeLabel.Content = "Tasks created: " + tasksMade;
@@ -1531,6 +1535,7 @@ private void SetSelectedProject() {
15311535
}
15321536

15331537
settingsGrid.Visibility = Visibility.Hidden;
1538+
statisticsGrid.Visibility = Visibility.Hidden;
15341539

15351540
border1.Style = (Style)TryFindResource("hoverOver");
15361541
border2.Style = (Style)TryFindResource("hoverOver");

0 commit comments

Comments
 (0)