mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2025-01-14 09:29:09 +01:00
parent
6b27a615dc
commit
58d533b1ca
@ -425,8 +425,7 @@ namespace DS4Windows
|
|||||||
[DS4Controls.SwipeLeft] = "Swipe Left",
|
[DS4Controls.SwipeLeft] = "Swipe Left",
|
||||||
[DS4Controls.SwipeRight] = "Swipe Right",
|
[DS4Controls.SwipeRight] = "Swipe Right",
|
||||||
[DS4Controls.SwipeUp] = "Swipe Up",
|
[DS4Controls.SwipeUp] = "Swipe Up",
|
||||||
[DS4Controls.SwipeUp] = "Swipe Up",
|
[DS4Controls.SwipeDown] = "Swipe Down",
|
||||||
[DS4Controls.SwipeDown] = "None",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
public static Dictionary<DS4Controls, int> macroDS4Values = new Dictionary<DS4Controls, int>()
|
public static Dictionary<DS4Controls, int> macroDS4Values = new Dictionary<DS4Controls, int>()
|
||||||
|
@ -118,7 +118,7 @@
|
|||||||
<RadioButton x:Name="useTouchControlsRadio" Content="Use As Controls" GroupName="tpMode" Click="UseTouchControlsRadio_Click" Margin="10,0,0,0" />
|
<RadioButton x:Name="useTouchControlsRadio" Content="Use As Controls" GroupName="tpMode" Click="UseTouchControlsRadio_Click" Margin="10,0,0,0" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel x:Name="useMousePanel" Margin="0,10,0,0">
|
<StackPanel x:Name="useMousePanel" Margin="0,10,0,0" Visibility="Visible">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<StackPanel Orientation="Horizontal" Height="20">
|
<StackPanel Orientation="Horizontal" Height="20">
|
||||||
<CheckBox Content="{lex:Loc TouchSlide}" IsChecked="{Binding TouchSenExists}" />
|
<CheckBox Content="{lex:Loc TouchSlide}" IsChecked="{Binding TouchSenExists}" />
|
||||||
@ -206,19 +206,19 @@
|
|||||||
|
|
||||||
<StackPanel x:Name="useControlsPanel" Margin="0,10,0,0" Visibility="Collapsed">
|
<StackPanel x:Name="useControlsPanel" Margin="0,10,0,0" Visibility="Collapsed">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<Button x:Name="swipeUpBtn" Content="Swipe Up" Width="70" />
|
<Button x:Name="swipeUpBtn" Content="Swipe Up" Width="70" Tag="36" Click="SwipeControlsButton_Click" />
|
||||||
<Label x:Name="swipeUpLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
<Label x:Name="swipeUpLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
||||||
<Button x:Name="swipeDownBtn" Content="Swipe Down" Width="70" />
|
<Button x:Name="swipeDownBtn" Content="Swipe Down" Width="70" Tag="37" Click="SwipeControlsButton_Click" />
|
||||||
<Label x:Name="swipeDownLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
<Label x:Name="swipeDownLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
||||||
<Button x:Name="swipeLeftBtn" Content="Swipe Left" Width="70" />
|
<Button x:Name="swipeLeftBtn" Content="Swipe Left" Width="70" Tag="34" Click="SwipeControlsButton_Click" />
|
||||||
<Label x:Name="swipeLeftLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
<Label x:Name="swipeLeftLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
<StackPanel Orientation="Horizontal" Margin="0,8,0,0">
|
||||||
<Button x:Name="swipeRightBtn" Content="Swipe Right" Width="70" />
|
<Button x:Name="swipeRightBtn" Content="Swipe Right" Width="70" Tag="35" Click="SwipeControlsButton_Click" />
|
||||||
<Label x:Name="swipeRightLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
<Label x:Name="swipeRightLb" Content="{Binding MappingName,FallbackValue=Unassigned}" Margin="10,0,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -1255,5 +1255,17 @@ namespace DS4WinWPF.DS4Forms
|
|||||||
mpControl.UpdateMappingName();
|
mpControl.UpdateMappingName();
|
||||||
UpdateHighlightLabel(mpControl);
|
UpdateHighlightLabel(mpControl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SwipeControlsButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
Button btn = sender as Button;
|
||||||
|
DS4Controls control = (DS4Controls)Convert.ToInt32(btn.Tag);
|
||||||
|
MappedControl mpControl = mappingListVM.ControlMap[control];
|
||||||
|
BindingWindow window = new BindingWindow(deviceNum, mpControl.Setting);
|
||||||
|
window.Owner = App.Current.MainWindow;
|
||||||
|
window.ShowDialog();
|
||||||
|
mpControl.UpdateMappingName();
|
||||||
|
UpdateHighlightLabel(mpControl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user