Skip to content

Commit

Permalink
Made SetDebugFlag static.
Browse files Browse the repository at this point in the history
Moved LoadingSplash and Workspace to Controls folder.
  • Loading branch information
TheHeadmaster committed Jul 27, 2024
1 parent 5c8833f commit 7ad0dfe
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Horizon/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Horizon.View;
using Horizon.View.Windows;
using ReactiveUI;
using Serilog;
using Serilog.Formatting.Compact;
Expand Down Expand Up @@ -54,7 +54,7 @@ public partial class App : Application
/// <inheritdoc />
protected override async void OnStartup(StartupEventArgs args)
{
this.SetDebugFlag();
SetDebugFlag();
this.InitializeLogging();
base.OnStartup(args);

Expand Down Expand Up @@ -147,7 +147,7 @@ private void OnUnhandledException(object sender, DispatcherUnhandledExceptionEve
/// <summary>
/// Sets the debug flag.
/// </summary>
private void SetDebugFlag()
private static void SetDebugFlag()
{
#if DEBUG
IsDebug = true;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<rui:ReactiveWindow x:Class="Horizon.View.LoadingSplash" x:TypeArguments="vm:LoadingSplashViewModel"
<rui:ReactiveWindow x:Class="Horizon.View.Windows.LoadingSplash" x:TypeArguments="vm:LoadingSplashViewModel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:rui="http://reactiveui.net"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ReactiveUI;
using System.Reactive.Disposables;

namespace Horizon.View;
namespace Horizon.View.Windows;

/// <summary>
/// Interaction logic for LoadingSplash.xaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Window x:Class="Horizon.Workspace"
<Window x:Class="Horizon.View.Windows.Workspace"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Horizon"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
<Grid>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
using System.Windows;

namespace Horizon;
namespace Horizon.View.Windows;

/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class Workspace : Window
public partial class Workspace
{
public Workspace()
{
Expand Down

0 comments on commit 7ad0dfe

Please sign in to comment.