watsonb8/aurora-sharp-desktop
Archived
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Styling improvements

Browse Source
This commit is contained in:
watsonb8 2019-12-01 16:14:36 -08:00
parent b60f2a4f47
commit 89d7d65d8d
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Aurora/Aurora.csproj
View File

@ -43,6 +43,9 @@
<Folder Include="Design\Views\Profile\" />
<Folder Include="Design\Components\DataGrid\" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Design\Behaviors\DeselectItemBehaviorBase.cs" />
</ItemGroup>
<ItemGroup>
<Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
<DependentUpon>Player.xaml</DependentUpon>

3
Aurora/Design/Components/Library/Library.css
View File

@ -1,3 +1,6 @@
Label {
margin-left: 25;
text-align: left;
vertical-align: middle;
word-wrap: break-word;
}

18
Aurora/Design/Components/Library/Library.xaml
View File

@ -14,7 +14,6 @@
SelectionEnabled="True"
RowHeight="30"
BorderColor="#3a3a3a"
BorderThickness="0"
HeaderFontSize="14"
HeaderHeight="45"
HeaderTextColor="White"
@ -27,7 +26,7 @@
<dg:DataGridColumn
Title=""
PropertyName="Icon"
Width="5">
Width="15">
<dg:DataGridColumn.CellTemplate>
<DataTemplate>
<Image Source="../../Resources/unselected.png" />
@ -43,9 +42,7 @@
<DataTemplate>
<Label
LineBreakMode="TailTruncation"
Text="{Binding .}"
HorizontalOptions="Start"
VerticalOptions="Center"/>
Text="{Binding .}"/>
</DataTemplate>
</dg:DataGridColumn.CellTemplate>
</dg:DataGridColumn>
@ -58,9 +55,7 @@
<DataTemplate>
<Label
LineBreakMode="TailTruncation"
Text="{Binding .}"
HorizontalOptions="Start"
VerticalOptions="Center"/>
Text="{Binding .}"/>
</DataTemplate>
</dg:DataGridColumn.CellTemplate>
</dg:DataGridColumn>
@ -72,19 +67,18 @@
<DataTemplate>
<Label
LineBreakMode="TailTruncation"
Text="{Binding .}"
HorizontalOptions="Start"
VerticalOptions="Center"
TextColor="White"/>
Text="{Binding .}"/>
</DataTemplate>
</dg:DataGridColumn.CellTemplate>
</dg:DataGridColumn>
</dg:DataGrid.Columns>
<dg:DataGrid.RowsTextColorPalette>
<dg:PaletteCollection>
<Color>White</Color>
</dg:PaletteCollection>
</dg:DataGrid.RowsTextColorPalette>
<dg:DataGrid.RowsBackgroundColorPalette>
<dg:PaletteCollection>
<Color>Transparent</Color>

5
Aurora/Design/Components/NavigationMenu/NavigationMenu.css
View File

@ -17,11 +17,12 @@ ListView {
font-size: 12;
font-family: Courier New, Courier, monospace;
font-style: italic;
padding-top: 18;
padding-top: 20;
}
#ItemCell label {
#ItemCell Label {
color: white;
background-color: #232323;
font-size: 15;
font-family: Courier New, Courier, monospace;
font-style: normal;

2
Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
View File

@ -2,6 +2,7 @@
<ContentView
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:behaviors="clr-namespace:Aurora.Design.Behaviors"
x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
<ContentView.Resources>
<StyleSheet
@ -12,6 +13,7 @@
<ListView
x:Name="MenuItemsListView"
HasUnevenRows="true"
SeparatorVisibility="None"
IsGroupingEnabled="true"
RowHeight="35"
CachingStrategy="RecycleElement">

5
Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
View File

@ -11,8 +11,13 @@ namespace Aurora.Design.Components.NavigationMenu
{
InitializeComponent();
ListView = MenuItemsListView;
}
private void ListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
{
throw new NotImplementedException();
}
public ListView ListView;

2
Aurora/Services/ClientService/ClientService.cs
View File

@ -140,7 +140,7 @@ namespace Aurora.Services.ClientService
public void StopEvents()
{
if (!_eventCancellationTokenSource.IsCancellationRequested)
if (_eventCancellationTokenSource != null && !_eventCancellationTokenSource.IsCancellationRequested)
{
_eventCancellationTokenSource.Cancel();
}