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

Fix theming for plugins

Browse Source
This commit is contained in:
John Gross
2018-04-12 18:04:15 -07:00
parent 03fa0a73b6
commit 85e307f8db
13 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Torch.Server/Themes/Dark Theme Animated.xaml
View File

@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Torch.Server.Themes">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />

3
Torch.Server/Themes/Dark Theme.xaml
View File

@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Torch.Server.Themes">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->

3
Torch.Server/Themes/Light Theme Animated.xaml
View File

@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Torch.Server.Themes">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>

3
Torch.Server/Themes/Light Theme.xaml
View File

@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Torch.Server.Themes">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->

11
Torch.Server/ViewModels/PluginViewModel.cs
View File

@@ -3,9 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using Torch.API;
using Torch.API.Plugins;
using Torch.Server.Views;
namespace Torch.Server.ViewModels
{
@@ -23,6 +25,15 @@ namespace Torch.Server.ViewModels
Control = p.GetControl();
Name = $"{plugin.Name} ({plugin.Version})";
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}
public void UpdateResourceDict(ResourceDictionary dictionary)
{
this.Control.Resources.MergedDictionaries.Clear();
this.Control.Resources.MergedDictionaries.Add(dictionary);
}
}
}

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

@@ -29,7 +29,7 @@ namespace Torch.Server.Views.Blocks
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -27,7 +27,7 @@ namespace Torch.Server.Views.Blocks
InitializeComponent();
DataContextChanged += OnDataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -24,7 +24,7 @@ namespace Torch.Server.Views.Entities
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -18,7 +18,7 @@ namespace Torch.Server.Views.Entities
InitializeComponent();
DataContextChanged += OnDataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -12,7 +12,7 @@ namespace Torch.Server.Views.Entities
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -24,7 +24,7 @@ namespace Torch.Server.Views.Entities
{
InitializeComponent();
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -26,7 +26,7 @@ namespace Torch.Server.Views.Entities
InitializeComponent();
DataContextChanged += VoxelMapView_DataContextChanged;
ThemeControl.UpdateWeirdViews += UpdateResourceDict;
ThemeControl.UpdateDynamicControls += UpdateResourceDict;
UpdateResourceDict(ThemeControl.currentTheme);
}

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

@@ -11,6 +11,7 @@ using System.Windows.Data;
using System.Windows.Media;
using System.Windows.Threading;
using Torch.API.Managers;
using Torch.API.Plugins;
using Torch.Server.Annotations;
using Torch.Server.Managers;
using Torch.Server.ViewModels;
@@ -25,7 +26,7 @@ namespace Torch.Server.Views
/// <summary>
/// Action other views can subscribe to to update their views if they dont inherit the style from the window for some reason.
/// </summary>
public static Action<ResourceDictionary> UpdateWeirdViews;
public static Action<ResourceDictionary> UpdateDynamicControls;
/// <summary>
/// Current theme other views can set their theme to when they first spawn
@@ -47,6 +48,7 @@ namespace Torch.Server.Views
}
private Dictionary<string, ResourceDictionary> _themes = new Dictionary<string, ResourceDictionary>();
private HashSet<ITorchPlugin> plugins;
public event PropertyChangedEventHandler PropertyChanged;
@@ -84,7 +86,7 @@ namespace Torch.Server.Views
uiSource.Resources.MergedDictionaries.Clear();
var resource = new ResourceDictionary() { Source = uri };
uiSource.Resources.MergedDictionaries.Add(resource);
UpdateWeirdViews?.Invoke(resource);
UpdateDynamicControls?.Invoke(resource);
currentTheme = resource;
}