Skip to content

Commit

Permalink
Set label in MouseButtonComboControl
Browse files Browse the repository at this point in the history
  • Loading branch information
@FaithBeam
FaithBeam committed Oct 5, 2024
1 parent d850b6b commit 6593d75
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 62 deletions.
27 changes: 18 additions & 9 deletions YMouseButtonControl.Core/ViewModels/LayerViewModel/LayerViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,24 @@ public LayerViewModel(
IProfilesService profilesService
)
{
Mb1ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb1);
Mb2ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb2);
Mb3ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb3);
Mb4ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb4);
Mb5ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb5);
MwuComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwu);
MwdComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwd);
MwlComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwl);
MwrComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwr);
Mb1ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb1, "Left Button");
Mb2ComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mb2, "Right Button");
Mb3ComboVm = mbComboViewModelFactory.CreateWithMouseButton(
MouseButton.Mb3,
"Middle Button"
);
Mb4ComboVm = mbComboViewModelFactory.CreateWithMouseButton(
MouseButton.Mb4,
"Mouse Button 4"
);
Mb5ComboVm = mbComboViewModelFactory.CreateWithMouseButton(
MouseButton.Mb5,
"Mouse Button 5"
);
MwuComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwu, "Wheel Up");
MwdComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwd, "Wheel Down");
MwlComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwl, "Wheel Left");
MwrComboVm = mbComboViewModelFactory.CreateWithMouseButton(MouseButton.Mwr, "Wheel Right");

this.WhenAnyValue(x => x.Mb1ComboVm.SelectedBtnMap)
.WhereNotNull()
Expand Down
7 changes: 7 additions & 0 deletions YMouseButtonControl.Core/ViewModels/LayerViewModel/MouseComboViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class MouseComboViewModel : ReactiveObject, IMouseComboViewModel, IDispos
private readonly IDisposable? _mWheelDisposable;
private IBrush _backgroundColor;
private readonly Timer _wheelTimer = new() { Interval = 200, AutoReset = false };
private string? _labelTxt;

public MouseComboViewModel(
IProfilesService profilesService,
Expand Down Expand Up @@ -180,6 +181,12 @@ public BaseButtonMappingVm? SelectedBtnMap
set => this.RaiseAndSetIfChanged(ref _selectedBtnMap, value);
}

public string? LabelTxt
{
get => _labelTxt;
set => this.RaiseAndSetIfChanged(ref _labelTxt, value);
}

public ReadOnlyObservableCollection<BaseButtonMappingVm> BtnMappings => _btnMappings;

public ReactiveCommand<Unit, Unit> UserClickedEditSettingButton { get; set; }
Expand Down
9 changes: 6 additions & 3 deletions YMouseButtonControl.Core/ViewModels/LayerViewModel/MouseComboViewModelFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace YMouseButtonControl.Core.ViewModels.LayerViewModel;

public interface IMouseComboViewModelFactory
{
IMouseComboViewModel CreateWithMouseButton(MouseButton mouseButton);
IMouseComboViewModel CreateWithMouseButton(MouseButton mouseButton, string labelTxt);
}

public class MouseComboViewModelFactory(
Expand All @@ -17,12 +17,15 @@ public class MouseComboViewModelFactory(
IShowSimulatedKeystrokesDialogService showSimulatedKeystrokesDialogService
) : IMouseComboViewModelFactory
{
public IMouseComboViewModel CreateWithMouseButton(MouseButton mouseButton) =>
public IMouseComboViewModel CreateWithMouseButton(MouseButton mouseButton, string labelTxt) =>
new MouseComboViewModel(
profilesService,
mouseListener,
themeService,
mouseButton,
showSimulatedKeystrokesDialogService
);
)
{
LabelTxt = labelTxt,
};
}
67 changes: 20 additions & 47 deletions YMouseButtonControl/Views/LayerView.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
<layerViewModel:LayerViewModel />
</Design.DataContext>

<UserControl.Styles>
<Style Selector="TabItem">
<Setter Property="FontSize" Value="14"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="MinHeight" Value="20" />
</Style>
<Style Selector="Label">
<Setter Property="VerticalAlignment" Value="Center"></Setter>
</Style>
</UserControl.Styles>
<UserControl.Styles>
<Style Selector="TabItem">
<Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="MinHeight" Value="20" />
</Style>
<Style Selector="Label">
<Setter Property="VerticalAlignment" Value="Center"></Setter>
</Style>
</UserControl.Styles>

<TabControl Padding="0">
<TabItem Header="Layer 1">
Expand All @@ -35,42 +35,15 @@
<Button Grid.Column="3" IsEnabled="False">Swap</Button>
<Button Grid.Column="4" IsEnabled="False">Reset</Button>
</Grid>
<Grid Grid.Row="1" ColumnDefinitions="150,*" Margin="5">
<Label Content="Left Button" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding Mb1ComboVm}" />
</Grid>
<Grid Grid.Row="2" ColumnDefinitions="150,*" Margin="5">
<Label Content="Right Button" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding Mb2ComboVm}" />
</Grid>
<Grid Grid.Row="3" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Middle Button" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding Mb3ComboVm}" />
</Grid>
<Grid Grid.Row="4" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Mouse Button 4" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding Mb4ComboVm}" />
</Grid>
<Grid Grid.Row="5" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Mouse Button 5" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding Mb5ComboVm}" />
</Grid>
<Grid Grid.Row="6" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Wheel Up" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding MwuComboVm}" />
</Grid>
<Grid Grid.Row="7" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Wheel Down" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding MwdComboVm}" />
</Grid>
<Grid Grid.Row="8" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Tilt Wheel Left" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding MwlComboVm}" />
</Grid>
<Grid Grid.Row="9" ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="Tilt Wheel Right" />
<views:MouseButtonComboControl Grid.Column="1" DataContext="{Binding MwrComboVm}" />
</Grid>
<views:MouseButtonComboControl Grid.Row="1" DataContext="{Binding Mb1ComboVm}" />
<views:MouseButtonComboControl Grid.Row="2" DataContext="{Binding Mb2ComboVm}" />
<views:MouseButtonComboControl Grid.Row="3" DataContext="{Binding Mb3ComboVm}" />
<views:MouseButtonComboControl Grid.Row="4" DataContext="{Binding Mb4ComboVm}" />
<views:MouseButtonComboControl Grid.Row="5" DataContext="{Binding Mb5ComboVm}" />
<views:MouseButtonComboControl Grid.Row="6" DataContext="{Binding MwuComboVm}" />
<views:MouseButtonComboControl Grid.Row="7" DataContext="{Binding MwdComboVm}" />
<views:MouseButtonComboControl Grid.Row="8" DataContext="{Binding MwlComboVm}" />
<views:MouseButtonComboControl Grid.Row="9" DataContext="{Binding MwrComboVm}" />
</Grid>
</TabItem>
<TabItem Header="Layer 2"></TabItem>
Expand Down
7 changes: 4 additions & 3 deletions YMouseButtonControl/Views/MouseButtonComboControl.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
<vm:MouseComboViewModel />
</Design.DataContext>

<Grid ColumnDefinitions="*,Auto">
<ComboBox ItemsSource="{Binding BtnMappings}"
<Grid ColumnDefinitions="150,*,Auto" Margin="5">
<Label Content="{Binding LabelTxt}" />
<ComboBox Grid.Column="1" ItemsSource="{Binding BtnMappings}"
SelectedItem="{Binding SelectedBtnMap}"
HorizontalAlignment="Stretch"
Background="{Binding BackgroundColor}">
</ComboBox>
<Button Grid.Column="1" Background="White" Command="{Binding UserClickedEditSettingButton}">
<Button Grid.Column="2" Background="White" Command="{Binding UserClickedEditSettingButton}">
<Image Source="../Resources/gear_icon1.png" />
</Button>
</Grid>
Expand Down

0 comments on commit 6593d75

Please sign in to comment.