The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-16 16:09:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

More actively refresh cached profile properties

Browse Source
This commit is contained in:
Travis Nickles 2020-03-18 21:39:07 -05:00
parent 7339afdd61
commit e42bfe670d
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -1694,6 +1694,13 @@ namespace DS4Windows
m_Config.containsCustomExtras[device] = HasCustomExtras(device); m_Config.containsCustomExtras[device] = HasCustomExtras(device);
} }
public static void CacheExtraProfileInfo(int device)
{
calculateProfileActionCount(device);
calculateProfileActionDicts(device);
cacheProfileCustomsFlags(device);
}
public static X360Controls getX360ControlsByName(string key) public static X360Controls getX360ControlsByName(string key)
{ {
return m_Config.getX360ControlsByName(key); return m_Config.getX360ControlsByName(key);

22
DS4Windows/DS4Forms/ProfileEditor.xaml.cs
View File

@ -583,8 +583,8 @@ namespace DS4WinWPF.DS4Forms
{ {
App.rootHub.setRumble(0, 0, profileSettingsVM.FuncDevNum); App.rootHub.setRumble(0, 0, profileSettingsVM.FuncDevNum);
} }
DS4Windows.Global.outDevTypeTemp[deviceNum] = DS4Windows.OutContType.X360; Global.outDevTypeTemp[deviceNum] = OutContType.X360;
DS4Windows.Global.LoadProfile(deviceNum, false, App.rootHub); Global.LoadProfile(deviceNum, false, App.rootHub);
Closed?.Invoke(this, EventArgs.Empty); Closed?.Invoke(this, EventArgs.Empty);
} }
@ -596,6 +596,7 @@ namespace DS4WinWPF.DS4Forms
window.ShowDialog(); window.ShowDialog();
mpControl.UpdateMappingName(); mpControl.UpdateMappingName();
UpdateHighlightLabel(mpControl); UpdateHighlightLabel(mpControl);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
private void InputControlHighlight(Button control) private void InputControlHighlight(Button control)
@ -704,9 +705,9 @@ namespace DS4WinWPF.DS4Forms
private void SetLateProperties() private void SetLateProperties()
{ {
DS4Windows.Global.BTPollRate[deviceNum] = profileSettingsVM.TempBTPollRateIndex; Global.BTPollRate[deviceNum] = profileSettingsVM.TempBTPollRateIndex;
DS4Windows.Global.OutContType[deviceNum] = profileSettingsVM.TempConType; Global.OutContType[deviceNum] = profileSettingsVM.TempConType;
DS4Windows.Global.outDevTypeTemp[deviceNum] = DS4Windows.OutContType.X360; Global.outDevTypeTemp[deviceNum] = OutContType.X360;
} }
private void SaveBtn_Click(object sender, RoutedEventArgs e) private void SaveBtn_Click(object sender, RoutedEventArgs e)
@ -746,9 +747,6 @@ namespace DS4WinWPF.DS4Forms
if (!File.Exists(tempprof)) if (!File.Exists(tempprof))
{ {
Global.SaveProfile(deviceNum, temp); Global.SaveProfile(deviceNum, temp);
Global.calculateProfileActionCount(deviceNum);
Global.calculateProfileActionDicts(deviceNum);
Global.cacheProfileCustomsFlags(deviceNum);
CreatedProfile?.Invoke(this, temp); CreatedProfile?.Invoke(this, temp);
Closed?.Invoke(this, EventArgs.Empty); Closed?.Invoke(this, EventArgs.Empty);
} }
@ -1075,6 +1073,7 @@ namespace DS4WinWPF.DS4Forms
baseSpeActPanel.Visibility = Visibility.Visible; baseSpeActPanel.Visibility = Visibility.Visible;
specialActionsVM.ExportEnabledActions(); specialActionsVM.ExportEnabledActions();
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
}; };
} }
@ -1103,6 +1102,7 @@ namespace DS4WinWPF.DS4Forms
specialActionsVM.ActionCol.Insert(currentIndex, newitem); specialActionsVM.ActionCol.Insert(currentIndex, newitem);
specialActionDockPanel.Children.Remove(actEditor); specialActionDockPanel.Children.Remove(actEditor);
baseSpeActPanel.Visibility = Visibility.Visible; baseSpeActPanel.Visibility = Visibility.Visible;
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
}; };
} }
} }
@ -1113,6 +1113,7 @@ namespace DS4WinWPF.DS4Forms
{ {
SpecialActionItem item = specialActionsVM.ActionCol[specialActionsVM.SpecialActionIndex]; SpecialActionItem item = specialActionsVM.ActionCol[specialActionsVM.SpecialActionIndex];
specialActionsVM.RemoveAction(item); specialActionsVM.RemoveAction(item);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
} }
@ -1217,6 +1218,7 @@ namespace DS4WinWPF.DS4Forms
profileSettingsVM.UseControllerReadout = false; profileSettingsVM.UseControllerReadout = false;
inputTimer.Stop(); inputTimer.Stop();
conReadingsUserCon.EnableControl(false); conReadingsUserCon.EnableControl(false);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
private void UseControllerReadoutCk_Click(object sender, RoutedEventArgs e) private void UseControllerReadoutCk_Click(object sender, RoutedEventArgs e)
@ -1239,6 +1241,7 @@ namespace DS4WinWPF.DS4Forms
window.ShowDialog(); window.ShowDialog();
mpControl.UpdateMappingName(); mpControl.UpdateMappingName();
UpdateHighlightLabel(mpControl); UpdateHighlightLabel(mpControl);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
private void MappingListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e) private void MappingListBox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@ -1273,6 +1276,7 @@ namespace DS4WinWPF.DS4Forms
window.ShowDialog(); window.ShowDialog();
mpControl.UpdateMappingName(); mpControl.UpdateMappingName();
UpdateHighlightLabel(mpControl); UpdateHighlightLabel(mpControl);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
private void SwipeControlsButton_Click(object sender, RoutedEventArgs e) private void SwipeControlsButton_Click(object sender, RoutedEventArgs e)
@ -1285,6 +1289,7 @@ namespace DS4WinWPF.DS4Forms
window.ShowDialog(); window.ShowDialog();
mpControl.UpdateMappingName(); mpControl.UpdateMappingName();
UpdateHighlightLabel(mpControl); UpdateHighlightLabel(mpControl);
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
} }
private void ConBtn_MouseRightButtonUp(object sender, MouseButtonEventArgs e) private void ConBtn_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
@ -1314,6 +1319,7 @@ namespace DS4WinWPF.DS4Forms
mpControl.UpdateMappingName(); mpControl.UpdateMappingName();
} }
Global.CacheExtraProfileInfo(profileSettingsVM.Device);
highlightControlDisplayLb.Content = ""; highlightControlDisplayLb.Content = "";
} }
} }

8
DS4Windows/DS4Forms/ViewModels/SpecialActionsListViewModel.cs
View File

@ -121,9 +121,7 @@ namespace DS4WinWPF.DS4Forms.ViewModels
} }
Global.ProfileActions[deviceNum] = pactions; Global.ProfileActions[deviceNum] = pactions;
Global.calculateProfileActionCount(deviceNum); Global.CacheExtraProfileInfo(deviceNum);
Global.calculateProfileActionDicts(deviceNum);
Global.cacheProfileCustomsFlags(deviceNum);
} }
public void RemoveAction(SpecialActionItem item) public void RemoveAction(SpecialActionItem item)
@ -131,9 +129,7 @@ namespace DS4WinWPF.DS4Forms.ViewModels
Global.RemoveAction(item.SpecialAction.name); Global.RemoveAction(item.SpecialAction.name);
actionCol.RemoveAt(specialActionIndex); actionCol.RemoveAt(specialActionIndex);
Global.ProfileActions[deviceNum].Remove(item.SpecialAction.name); Global.ProfileActions[deviceNum].Remove(item.SpecialAction.name);
Global.calculateProfileActionCount(deviceNum); Global.CacheExtraProfileInfo(deviceNum);
Global.calculateProfileActionDicts(deviceNum);
Global.cacheProfileCustomsFlags(deviceNum);
} }
} }

4
DS4Windows/ProfileEntity.cs
View File

@ -43,9 +43,7 @@ namespace DS4WinWPF
if (!string.IsNullOrWhiteSpace(name)) if (!string.IsNullOrWhiteSpace(name))
{ {
DS4Windows.Global.SaveProfile(deviceNum, name); DS4Windows.Global.SaveProfile(deviceNum, name);
DS4Windows.Global.calculateProfileActionCount(deviceNum); DS4Windows.Global.CacheExtraProfileInfo(deviceNum);
DS4Windows.Global.calculateProfileActionDicts(deviceNum);
DS4Windows.Global.cacheProfileCustomsFlags(deviceNum);
} }
} }