PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Themes apply everywhere now

Browse Source
This commit is contained in:
sirhamsteralot
2018-03-26 02:19:27 +02:00
committed by John Gross
parent d92daccdbf
commit b18420ad55
9 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Torch.Server/Views/Entities/Blocks/BlockView.xaml.cs
View File

@@ -28,6 +28,15 @@ namespace Torch.Server.Views.Blocks
public BlockView()
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
/*

9
Torch.Server/Views/Entities/Blocks/PropertyView.xaml.cs
View File

@@ -26,6 +26,15 @@ namespace Torch.Server.Views.Blocks
{
InitializeComponent();
DataContextChanged += OnDataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs args)

9
Torch.Server/Views/Entities/CharacterView.xaml.cs
View File

@@ -23,6 +23,15 @@ namespace Torch.Server.Views.Entities
public CharacterView()
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
}
}

9
Torch.Server/Views/Entities/EntityControlHost.xaml.cs
View File

@@ -17,6 +17,15 @@ namespace Torch.Server.Views.Entities
{
InitializeComponent();
DataContextChanged += OnDataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

12
Torch.Server/Views/Entities/EntityControlsView.xaml.cs
View File

@@ -1,4 +1,5 @@
using System.Windows.Controls;
using System.Windows;
using System.Windows.Controls;
namespace Torch.Server.Views.Entities
{
@@ -10,6 +11,15 @@ namespace Torch.Server.Views.Entities
public EntityControlsView()
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
}
}

1
Torch.Server/Views/Entities/GridView.xaml
View File

@@ -6,6 +6,7 @@
xmlns:entities="clr-namespace:Torch.Server.ViewModels.Entities"
xmlns:local="clr-namespace:Torch.Server.Views.Entities"
mc:Ignorable="d">
<UserControl.DataContext>
<entities:GridViewModel />
</UserControl.DataContext>

9
Torch.Server/Views/Entities/GridView.xaml.cs
View File

@@ -23,6 +23,15 @@ namespace Torch.Server.Views.Entities
public GridView()
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
}
}

9
Torch.Server/Views/Entities/VoxelMapView.xaml.cs
View File

@@ -25,6 +25,15 @@ namespace Torch.Server.Views.Entities
{
InitializeComponent();
DataContextChanged += VoxelMapView_DataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Resources.MergedDictionaries.Clear();
this.Resources.MergedDictionaries.Add(dictionary);
}
private void VoxelMapView_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)

8
Torch.Server/Views/ThemeControl.xaml.cs
View File

@@ -22,6 +22,9 @@ namespace Torch.Server.Views
/// </summary>
public partial class ThemeControl : UserControl, INotifyPropertyChanged
{
public static Action<ResourceDictionary> UpdateWeirdViews;
public static ResourceDictionary currentTheme;
public TorchUI uiSource;
private TorchConfig _torchConfig;
@@ -66,7 +69,10 @@ namespace Torch.Server.Views
public void ChangeTheme(Uri uri)
{
uiSource.Resources.MergedDictionaries.Clear();
uiSource.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = uri });
var resource = new ResourceDictionary() { Source = uri };
uiSource.Resources.MergedDictionaries.Add(resource);
UpdateWeirdViews?.Invoke(resource);
currentTheme = resource;
}
private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)