Index: Native/Src/Packages/Samples/Buttons/Data/MainWindow.xaml
===================================================================
--- Native/Src/Packages/Samples/Buttons/Data/MainWindow.xaml (revision 166697)
+++ Native/Src/Packages/Samples/Buttons/Data/MainWindow.xaml (working copy)
@@ -6,170 +6,25 @@
xmlns:local="clr-namespace:Buttons"
xmlns:noesis="clr-namespace:NoesisGUIExtensions;assembly=Noesis.GUI.Extensions"
Title="NoesisGUI - Buttons"
+ Background="Gray"
d:DesignWidth="1280" d:DesignHeight="720">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Native/Src/Packages/Samples/Buttons/Data/ViewModel.cs
===================================================================
--- Native/Src/Packages/Samples/Buttons/Data/ViewModel.cs (revision 166697)
+++ Native/Src/Packages/Samples/Buttons/Data/ViewModel.cs (working copy)
@@ -6,49 +6,67 @@
using System;
#endif
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
namespace Buttons
{
///
/// Buttons sample view model
///
- public class ViewModel
+ public class ViewModel : INotifyPropertyChanged
{
public ViewModel()
{
- StartCommand = new DelegateCommand(this.Start);
- SettingsCommand = new DelegateCommand(this.Settings);
- ExitCommand = new DelegateCommand(this.Exit);
+ Command_1 = new DelegateCommand((o) => {
+ IsChecked_1 = true;
+ IsChecked_2 = false;
+ });
+
+ Command_2 = new DelegateCommand((o) => {
+ IsChecked_1 = false;
+ IsChecked_2 = true;
+ });
+
}
- public DelegateCommand StartCommand { get; private set; }
- public DelegateCommand SettingsCommand { get; private set; }
- public DelegateCommand ExitCommand { get; private set; }
-
- private void Start(object parameter)
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
- #if NOESIS
- Debug.Log("Start Game");
- #else
- Console.WriteLine("Start Game");
- #endif
+ this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
- private void Settings(object parameter)
+ bool m_isChecked_1 = true;
+ public bool IsChecked_1
{
- #if NOESIS
- Debug.Log("Change Settings");
- #else
- Console.WriteLine("Change Settings");
- #endif
+ get
+ {
+ return m_isChecked_1;
+ }
+ set
+ {
+ m_isChecked_1 = value;
+ OnPropertyChanged("IsChecked_1");
+ }
}
- private void Exit(object parameter)
+ bool m_isChecked_2 = false;
+ public bool IsChecked_2
{
- #if NOESIS
- Debug.Log("Exit Game");
- #else
- Console.WriteLine("Exit Game");
- #endif
+ get
+ {
+ return m_isChecked_2;
+ }
+ set
+ {
+ m_isChecked_2 = value;
+ OnPropertyChanged("IsChecked_2");
+ }
}
+
+ public DelegateCommand Command_1 { get; set; }
+ public DelegateCommand Command_2 { get; set; }
+
}
}
Index: Native/Src/Packages/Samples/Buttons/Src/ViewModel.cpp
===================================================================
--- Native/Src/Packages/Samples/Buttons/Src/ViewModel.cpp (revision 166697)
+++ Native/Src/Packages/Samples/Buttons/Src/ViewModel.cpp (working copy)
@@ -12,60 +12,48 @@
using namespace NoesisApp;
using namespace Buttons;
+using namespace Noesis;
-
////////////////////////////////////////////////////////////////////////////////////////////////////
ViewModel::ViewModel()
{
- _startCommand.SetExecuteFunc(MakeDelegate(this, &ViewModel::Start));
- _settingsCommand.SetExecuteFunc(MakeDelegate(this, &ViewModel::Settings));
- _exitCommand.SetExecuteFunc(MakeDelegate(this, &ViewModel::Exit));
+ m_command_1.SetExecuteFunc(MakeDelegate(this, &ViewModel::Check_1));
+ m_command_2.SetExecuteFunc(MakeDelegate(this, &ViewModel::Check_2));
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-const DelegateCommand* ViewModel::GetStartCommand() const
+void ViewModel::SetIsChecked_1(bool b)
{
- return &_startCommand;
+ m_isChecked_1 = b;
+ OnPropertyChanged("IsChecked_1");
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-const DelegateCommand* ViewModel::GetSettingsCommand() const
+void ViewModel::SetIsChecked_2(bool b)
{
- return &_settingsCommand;
+ m_isChecked_2 = b;
+ OnPropertyChanged("IsChecked_2");
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-const DelegateCommand* ViewModel::GetExitCommand() const
+void ViewModel::Check_1(Noesis::BaseComponent*)
{
- return &_exitCommand;
+ SetIsChecked_1(true);
+ SetIsChecked_2(false);
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void ViewModel::Start(BaseComponent*)
+void ViewModel::Check_2(Noesis::BaseComponent*)
{
- NS_LOG_INFO("Start Game");
+ SetIsChecked_1(false);
+ SetIsChecked_2(true);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ViewModel::Settings(BaseComponent*)
-{
- NS_LOG_INFO("Change Settings");
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-void ViewModel::Exit(BaseComponent*)
-{
- NS_LOG_INFO("Exit Game");
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
NS_BEGIN_COLD_REGION
NS_IMPLEMENT_REFLECTION(ViewModel)
{
- NsProp("StartCommand", &ViewModel::GetStartCommand);
- NsProp("SettingsCommand", &ViewModel::GetSettingsCommand);
- NsProp("ExitCommand", &ViewModel::GetExitCommand);
+ NsProp("IsChecked_1", &GetIsChecked_1, &SetIsChecked_1);
+ NsProp("IsChecked_2", &GetIsChecked_2, &SetIsChecked_2);
+ NsProp("Command_1", &GetCommand_1);
+ NsProp("Command_2", &GetCommand_2);
}
NS_END_COLD_REGION
Index: Native/Src/Packages/Samples/Buttons/Src/ViewModel.h
===================================================================
--- Native/Src/Packages/Samples/Buttons/Src/ViewModel.h (revision 166697)
+++ Native/Src/Packages/Samples/Buttons/Src/ViewModel.h (working copy)
@@ -12,32 +12,39 @@
#include
#include
#include
+#include
+#include
-
namespace Buttons
{
////////////////////////////////////////////////////////////////////////////////////////////////////
-class ViewModel final: public Noesis::BaseComponent
+class ViewModel final: public NoesisApp::NotifyPropertyChangedBase
{
public:
ViewModel();
private:
- const NoesisApp::DelegateCommand* GetStartCommand() const;
- const NoesisApp::DelegateCommand* GetSettingsCommand() const;
- const NoesisApp::DelegateCommand* GetExitCommand() const;
+ bool GetIsChecked_1() const { return m_isChecked_1; }
+ bool GetIsChecked_2() const { return m_isChecked_2; }
- void Start(BaseComponent* param);
- void Settings(BaseComponent* param);
- void Exit(BaseComponent* param);
+ const NoesisApp::DelegateCommand* GetCommand_1() const { return &m_command_1; }
+ const NoesisApp::DelegateCommand* GetCommand_2() const { return &m_command_2; }
+ void SetIsChecked_1(bool b);
+ void SetIsChecked_2(bool b);
+
+ void Check_1(Noesis::BaseComponent* param);
+ void Check_2(Noesis::BaseComponent* param);
+
private:
- NoesisApp::DelegateCommand _startCommand;
- NoesisApp::DelegateCommand _settingsCommand;
- NoesisApp::DelegateCommand _exitCommand;
+ bool m_isChecked_1 = true;
+ bool m_isChecked_2 = false;
- NS_DECLARE_REFLECTION(ViewModel, BaseComponent)
+ NoesisApp::DelegateCommand m_command_1;
+ NoesisApp::DelegateCommand m_command_2;
+
+ NS_DECLARE_REFLECTION(ViewModel, NotifyPropertyChangedBase)
};
}