The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-29 12:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to fix Touchpad panel display. Preemptive gyro panel display change

Browse Source
This commit is contained in:
Travis Nickles 2020-03-12 21:59:47 -05:00
parent c727dcc015
commit 605f2e8cdf
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,39 +65,9 @@ namespace DS4WinWPF.DS4Forms
profileSettingsVM = new ProfileSettingsViewModel(device); profileSettingsVM = new ProfileSettingsViewModel(device);
picBoxHover.Visibility = Visibility.Hidden; picBoxHover.Visibility = Visibility.Hidden;
picBoxHover2.Visibility = Visibility.Hidden; picBoxHover2.Visibility = Visibility.Hidden;
bool touchMouse = profileSettingsVM.UseTouchMouse;
if (!touchMouse)
{
useMousePanel.Visibility = Visibility.Collapsed;
useControlsPanel.Visibility = Visibility.Visible;
useTouchControlsRadio.IsChecked = true;
}
else
{
useTouchMouseRadio.IsChecked = true;
}
//useControlsPanel.Visibility = !touchMouse ? Visibility.Visible : Visibility.Collapsed; //SetTouchpadPanel();
activeTouchPanel = touchMouse ? useMousePanel : useControlsPanel; //SetupGyroPanel();
//activeTouchPanel = useMousePanel;
switch (profileSettingsVM.GyroOutModeIndex)
{
case 0:
activeGyroModePanel = gyroControlsPanel; break;
case 1:
activeGyroModePanel = gyroMousePanel; break;
case 2:
activeGyroModePanel = gyroMouseJoystickPanel; break;
default:
activeGyroModePanel = gyroControlsPanel; break;
}
//activeGyroModePanel = gyroControlsPanel;
gyroControlsPanel.Visibility = Visibility.Collapsed;
gyroMousePanel.Visibility = Visibility.Collapsed;
gyroMouseJoystickPanel.Visibility = Visibility.Collapsed;
activeGyroModePanel.Visibility = Visibility.Visible;
mappingListVM = new MappingListViewModel(deviceNum, profileSettingsVM.ContType); mappingListVM = new MappingListViewModel(deviceNum, profileSettingsVM.ContType);
specialActionsVM = new SpecialActionsListViewModel(device); specialActionsVM = new SpecialActionsListViewModel(device);
@ -131,6 +101,48 @@ namespace DS4WinWPF.DS4Forms
profileSettingsVM.SZDeadZoneChanged += UpdateReadingsSZDeadZone; profileSettingsVM.SZDeadZoneChanged += UpdateReadingsSZDeadZone;
} }
private void SetTouchpadPanel()
{
bool touchMouse = profileSettingsVM.UseTouchMouse;
if (!touchMouse)
{
useMousePanel.Visibility = Visibility.Collapsed;
useControlsPanel.Visibility = Visibility.Visible;
useTouchControlsRadio.IsChecked = true;
}
else
{
useMousePanel.Visibility = Visibility.Visible;
useControlsPanel.Visibility = Visibility.Collapsed;
useTouchMouseRadio.IsChecked = true;
}
//useControlsPanel.Visibility = !touchMouse ? Visibility.Visible : Visibility.Collapsed;
activeTouchPanel = touchMouse? useMousePanel : useControlsPanel;
//activeTouchPanel = useMousePanel;
}
private void SetupGyroPanel()
{
switch (profileSettingsVM.GyroOutModeIndex)
{
case 0:
activeGyroModePanel = gyroControlsPanel; break;
case 1:
activeGyroModePanel = gyroMousePanel; break;
case 2:
activeGyroModePanel = gyroMouseJoystickPanel; break;
default:
activeGyroModePanel = gyroControlsPanel; break;
}
//activeGyroModePanel = gyroControlsPanel;
gyroControlsPanel.Visibility = Visibility.Collapsed;
gyroMousePanel.Visibility = Visibility.Collapsed;
gyroMouseJoystickPanel.Visibility = Visibility.Collapsed;
activeGyroModePanel.Visibility = Visibility.Visible;
}
private void UpdateReadingsSZDeadZone(object sender, EventArgs e) private void UpdateReadingsSZDeadZone(object sender, EventArgs e)
{ {
conReadingsUserCon.SixAxisZDead = profileSettingsVM.SZDeadZone; conReadingsUserCon.SixAxisZDead = profileSettingsVM.SZDeadZone;
@ -547,6 +559,8 @@ namespace DS4WinWPF.DS4Forms
mappingListBox.DataContext = mappingListVM; mappingListBox.DataContext = mappingListVM;
specialActionsTab.DataContext = specialActionsVM; specialActionsTab.DataContext = specialActionsVM;
lightbarRect.DataContext = profileSettingsVM; lightbarRect.DataContext = profileSettingsVM;
SetTouchpadPanel();
SetupGyroPanel();
conReadingsUserCon.LsDead = profileSettingsVM.LSDeadZone; conReadingsUserCon.LsDead = profileSettingsVM.LSDeadZone;
conReadingsUserCon.RsDead = profileSettingsVM.RSDeadZone; conReadingsUserCon.RsDead = profileSettingsVM.RSDeadZone;