Skip to content

Commit 654b043

Browse files
committed
Update UI v1.7
1 parent 65cedc7 commit 654b043

7 files changed

Lines changed: 17 additions & 10 deletions

File tree

BasicUI_Paradox/BasicUI_Paradox/Assets/Shared/Segoe_UI_10_Regular.pdxfnt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!SpriteFont
2-
Id: cfcf4b80-0fbc-4a5b-b09e-9bd05b836a5c
2+
Id: c893bcd2-350a-4c55-8cf5-9839938fc086
33
Tags: []
44
Source: null
55
FontName: Segoe UI

BasicUI_Paradox/BasicUI_Paradox/Assets/Shared/Segoe_UI_15_Bold.pdxfnt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!SpriteFont
2-
Id: 0d2e5c35-6199-4a2f-8d87-5bd9830c9b16
2+
Id: f316b484-2e7d-4bb9-bfbb-72b700fdea89
33
Tags: []
44
Source: null
55
FontName: Segoe UI

BasicUI_Paradox/BasicUI_Paradox/Assets/Shared/Segoe_UI_9_Regular.pdxfnt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!SpriteFont
2-
Id: 7a60f054-59d1-4544-9964-28897314875e
2+
Id: 390d439d-ce0d-4ed9-95d0-a8332ce88f3e
33
Tags: []
44
Source: null
55
FontName: Segoe UI

BasicUI_Paradox/BasicUI_Paradox/BasicUI_Paradox.Game/BasicUIScript.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Text;
55
using System.Threading.Tasks;
66
using EmptyKeys.UserInterface;
7+
using EmptyKeys.UserInterface.Debug;
78
using EmptyKeys.UserInterface.Generated;
89
using EmptyKeys.UserInterface.Media;
910
using SiliconStudio.Core.Mathematics;
@@ -18,6 +19,7 @@ namespace BasicUI_Paradox
1819
public class BasicUIScript : AsyncScript
1920
{
2021
private BasicUI uiRoot;
22+
private DebugViewModel debug;
2123

2224
public override async Task Execute()
2325
{
@@ -27,6 +29,7 @@ public override async Task Execute()
2729

2830
Viewport viewport = GraphicsDevice.Viewport;
2931
uiRoot = new BasicUI((int)viewport.Width, (int)viewport.Height);
32+
debug = new DebugViewModel(uiRoot);
3033
uiRoot.DataContext = new BasicUIViewModel();
3134

3235
FontManager.Instance.LoadFonts(Asset);
@@ -40,7 +43,7 @@ public override async Task Execute()
4043
while (Game.IsRunning)
4144
{
4245
await Script.NextFrame();
43-
46+
debug.Update();
4447
uiRoot.UpdateInput(Game.UpdateTime.Elapsed.TotalMilliseconds);
4548
uiRoot.UpdateLayout(Game.UpdateTime.Elapsed.TotalMilliseconds);
4649
}
@@ -49,6 +52,7 @@ public override async Task Execute()
4952
private void Render(RenderContext arg1, RenderFrame arg2)
5053
{
5154
uiRoot.Draw(Game.UpdateTime.Elapsed.TotalMilliseconds);
55+
debug.Draw();
5256
}
5357
}
5458
}

BasicUI_Paradox/BasicUI_Paradox/BasicUI_Paradox.Game/BasicUI_Paradox.Game.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<Reference Include="EmptyKeys.UserInterface.Core">
8787
<HintPath>..\..\..\EmptyKeysUI\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
8888
</Reference>
89+
<Reference Include="EmptyKeys.UserInterface.Debug">
90+
<HintPath>..\..\..\EmptyKeysUI\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
91+
</Reference>
8992
</ItemGroup>
9093
<ItemGroup />
9194
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

BasicUI_Paradox/BasicUI_Paradox/BasicUI_Paradox.Game/GeneratedUI/BasicUI.xaml.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace EmptyKeys.UserInterface.Generated {
2020
using EmptyKeys.UserInterface.Themes;
2121

2222

23-
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.6.5.0")]
23+
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.0.0")]
2424
public partial class BasicUI : UIRoot {
2525

2626
private Grid e_0;
@@ -228,7 +228,7 @@ private void InitializeComponent() {
228228
this.e_5.Height = 150F;
229229
this.e_5.Width = 400F;
230230
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
231-
this.e_5.ItemsSource = this.Get_e_5_Items();
231+
this.e_5.ItemsSource = Get_e_5_Items();
232232
// e_18 element
233233
this.e_18 = new ProgressBar();
234234
this.e_3.Children.Add(this.e_18);
@@ -359,7 +359,7 @@ private static UIElement combo_dtMethod(UIElement parent) {
359359
return e_4;
360360
}
361361

362-
private System.Collections.ObjectModel.ObservableCollection<object> Get_e_5_Items() {
362+
private static System.Collections.ObjectModel.ObservableCollection<object> Get_e_5_Items() {
363363
System.Collections.ObjectModel.ObservableCollection<object> items = new System.Collections.ObjectModel.ObservableCollection<object>();
364364
// e_6 element
365365
TabItem e_6 = new TabItem();
@@ -395,7 +395,7 @@ private System.Collections.ObjectModel.ObservableCollection<object> Get_e_5_Item
395395
e_11.Name = "e_11";
396396
e_11.Height = 100F;
397397
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
398-
e_11.ItemsSource = this.Get_e_11_Items();
398+
e_11.ItemsSource = Get_e_11_Items();
399399
items.Add(e_9);
400400
// e_16 element
401401
TabItem e_16 = new TabItem();
@@ -427,7 +427,7 @@ private static UIElement e_7_dtMethod(UIElement parent) {
427427
return e_8;
428428
}
429429

430-
private System.Collections.ObjectModel.ObservableCollection<object> Get_e_11_Items() {
430+
private static System.Collections.ObjectModel.ObservableCollection<object> Get_e_11_Items() {
431431
System.Collections.ObjectModel.ObservableCollection<object> items = new System.Collections.ObjectModel.ObservableCollection<object>();
432432
// e_12 element
433433
ListBoxItem e_12 = new ListBoxItem();

BasicUI_Paradox/BasicUI_Paradox/BasicUI_Paradox.Game/GeneratedUI/Dictionary.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace EmptyKeys.UserInterface.Generated {
2020
using EmptyKeys.UserInterface.Themes;
2121

2222

23-
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.6.5.0")]
23+
[GeneratedCodeAttribute("Empty Keys UI Generator", "1.7.0.0")]
2424
public sealed class Dictionary : ResourceDictionary {
2525

2626
private static Dictionary singleton = new Dictionary();

0 commit comments

Comments
 (0)