fix binding of cheat code

duchuule · Jul 6, 2015 · f0d33af · f0d33af
1 parent 1b1cb36
commit f0d33af
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 19 deletions.
diff --git a/CheatData.h b/CheatData.h
@@ -1,16 +1,52 @@
-#ifndef CHEATDATA_H_
-#define CHEATDATA_H_
+#pragma once
 
 namespace VBA10
 {
-	//[Windows::UI::Xaml::Data::BindableAttribute]
+	[Windows::UI::Xaml::Data::BindableAttribute]
 	public ref class CheatData sealed
 	{
 	public:
-		property Platform::String ^CheatCode;
-		property Platform::String ^Description;
-		property bool Enabled;
+		property Platform::String^ CheatCode
+		{
+			Platform::String^ get()
+			{
+				return _cheatcode;
+			}
+			void set(Platform::String^ value)
+			{
+				_cheatcode = value;
+			}
+		}
+
+		property Platform::String^ Description
+		{
+			Platform::String^ get()
+			{
+				return _description;
+			}
+			void set(Platform::String^ value)
+			{
+				_description = value;
+			}
+		}
+
+		property bool Enabled
+		{
+			bool get()
+			{
+				return _enabled;
+			}
+			void set(bool value)
+			{
+				_enabled = value;
+			}
+		}
+
+	private:
+		Platform::String ^ _cheatcode;
+		Platform::String ^ _description;
+		bool _enabled;
+
 	};
 }
 
-#endif
diff --git a/CheatPane.xaml b/CheatPane.xaml
@@ -101,10 +101,15 @@
                                 <ColumnDefinition Width="84" />
                             </Grid.ColumnDefinitions>
                             <StackPanel Orientation="Horizontal">
-                                <CheckBox Name="enableCheatBox" IsChecked="{Binding Enabled}" Margin="0,0,15,0" Checked="enableCheatBox_Checked" Unchecked="enableCheatBox_Checked" />
-                                <StackPanel Grid.Column="0" Orientation="Vertical" HorizontalAlignment="Left">
-                                    <TextBlock Foreground="White" Text="{Binding CheatCode}" Width="auto" Height="auto" FontSize="26"/>
-                                    <TextBlock Foreground="White" Text="{Binding Description}" Width="auto" Height="auto" FontSize="14" />
+                                <CheckBox Name="enableCheatBox" 
+                                          IsChecked="{Binding Enabled}" 
+                                          Margin="0,0,15,0" 
+                                          Checked="enableCheatBox_Checked"
+                                          Unchecked="enableCheatBox_Checked" />
+                                <StackPanel Grid.Column="0" Orientation="Vertical" 
+                                            HorizontalAlignment="Left">
+                                    <TextBlock  Text="{Binding CheatCode}"  FontSize="26"/>
+                                    <TextBlock  Text="{Binding Description}" FontSize="14" />
                                 </StackPanel>
                             </StackPanel>
                             <Button Grid.Column="1"  

diff --git a/CheatPane.xaml.cpp b/CheatPane.xaml.cpp
@@ -81,6 +81,7 @@ void CheatPane::RefreshCheatList(void)
 {
 	this->cheatList->ItemsSource = nullptr;
 	this->cheatList->ItemsSource = this->cheatCodes;
+	//cvsAllCheats->Source = this->cheatCodes;
 }
 
 
@@ -249,8 +250,7 @@ Vector<Platform::String ^>^ CheatPane::GetCodes(Platform::String ^codeText)
 	bool continuedFromLast = false;
 	stringstream ss;
 
-	if (continuedFromLast == false) //reset the string builder if not continued from last time
-		ss.str("");  //clear the stringstream
+
 
 	for (int i = 0; i < codeParts.size(); i++)
 	{
@@ -259,6 +259,9 @@ Vector<Platform::String ^>^ CheatPane::GetCodes(Platform::String ^codeText)
 		replaceAll(line, "\t", "");
 		replaceAll(line, "-", "");
 
+		if (continuedFromLast == false) //reset the string builder if not continued from last time
+			ss.str("");  //clear the stringstream
+
 		if (line.size() == 6)
 		{
 			ss << line.substr(0, 3);

diff --git a/SelectROMPane.xaml.cpp b/SelectROMPane.xaml.cpp
@@ -61,12 +61,6 @@ SelectROMPane::SelectROMPane()
 	int index = 0;
 	for (int i = 1; i < App::ROMDB->AllROMDBEntries->Size; i++)
 	{
-#if _DEBUG
-		int64 test = App::ROMDB->AllROMDBEntries->GetAt(i)->LastPlayed.UniversalTime;
-		Platform::String ^message = test + "\n";
-		wstring wstr(message->Begin(), message->End());
-		OutputDebugStringW(wstr.c_str());
-#endif
 
 		if (App::ROMDB->AllROMDBEntries->GetAt(i)->LastPlayed.UniversalTime > App::ROMDB->AllROMDBEntries->GetAt(index)->LastPlayed.UniversalTime)
 			index = i;