From 15cdb3f3d3a1abf2e6afe0268578cc5ee833d384 Mon Sep 17 00:00:00 2001
From: Tony Bark <35226681+tonytins@users.noreply.github.com>
Date: Fri, 15 May 2026 11:09:57 -0400
Subject: [PATCH] Swapped combo boxes for lists boxes

---
 CyberBits/CyberBits.csproj            |  1 +
 CyberBits/ViewModels/ViewModelBase.cs | 47 +++++++++++++++++++----
 CyberBits/Views/MainWindow.axaml      | 54 ++++++++++++++++-----------
 3 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/CyberBits/CyberBits.csproj b/CyberBits/CyberBits.csproj
index c4b89b3..d98e0b8 100644
--- a/CyberBits/CyberBits.csproj
+++ b/CyberBits/CyberBits.csproj
@@ -3,6 +3,7 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
+        <RollForward>LatestMajor</RollForward>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
diff --git a/CyberBits/ViewModels/ViewModelBase.cs b/CyberBits/ViewModels/ViewModelBase.cs
index 73d0d35..3d616ef 100644
--- a/CyberBits/ViewModels/ViewModelBase.cs
+++ b/CyberBits/ViewModels/ViewModelBase.cs
@@ -5,31 +5,62 @@ namespace CyberBits.ViewModels;
 
 public partial class ViewModelBase : ObservableObject
 {
-    public ObservableCollection<string> Genitals { get; } = ["Cock", "Pussy"];
+    public ObservableCollection<string> GenitalsList { get; } = ["Cock", "Pussy"];
 
-    public ObservableCollection<string> Models { get; } =
+    public ObservableCollection<string> ModelsList { get; } =
     [
         "Au Natural",
-        "Les Americaines"
+        "Les Americaines",
+        "La Grand Chungus",
+        "Veini Vici",
+        "Das Banane",
+        "The Ace Custom"
     ];
 
-    public ObservableCollection<string> Styles { get; } =
+    public ObservableCollection<string> AestheticsList { get; } =
     [
         "Bioware",
-        "Cyberware"
+        "Cyberware",
+        "Roboware",
+        "Holoware"
     ];
 
-    public ObservableCollection<string> Cyberware { get; } =
+    public ObservableCollection<string> CyberwareList { get; } =
     [
         "Piercings",
-        "Datajack"
+        "Datajack",
+        "Censor Field",
+        "Laser Sight",
+        "AI-Controlled Booster Module",
+        "Second Bladder",
+        "Map Hack",
+        "Monowire Blade",
+        "Projectile Launcher"
+    ];
+
+    public ObservableCollection<string> PubesList { get; } =
+    [
+        "The Baldie",
+        "The Peach",
+        "The Landing Strip",
+        "The Peek-a-Boo",
+        "The Rectangle",
+        "The Bar Code",
+        "The Heart",
+        "The Lighting Bolt",
+        "The Neat Triangle",
+        "The Forest",
+        "The Jungle",
+        "The Breath of the Wild"
     ];
 
     [ObservableProperty] private string? _selectedBits;
 
     [ObservableProperty] private string? _selectedModels;
 
-    [ObservableProperty] private string? _selectedStyles;
+    [ObservableProperty] private string? _selectedAesthetics;
 
     [ObservableProperty] private string? _selectedCyberware;
+
+    [ObservableProperty] private string? _selectedPubes;
 }
diff --git a/CyberBits/Views/MainWindow.axaml b/CyberBits/Views/MainWindow.axaml
index ee68ff6..adf846b 100644
--- a/CyberBits/Views/MainWindow.axaml
+++ b/CyberBits/Views/MainWindow.axaml
@@ -29,35 +29,45 @@
             <Image x:Name="BitsImage" Grid.Column="0" Source="avares://CyberBits/Assets/cock.jpg" />
             <GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
             <StackPanel Grid.Column="1">
+                <ComboBox  ItemsSource="{Binding GenitalsList}"
+                           SelectedItem="{Binding SelectedBits}"
+                           PlaceholderText="Genitals"
+                           Width="100"
+                           HorizontalContentAlignment="Center"
+                           SelectedValue="0"
+                           x:Name="BitSelection"
+                           HorizontalAlignment="Center"
+                           SelectionChanged="SelectedBitsControl_OnSelectionChanged"
+                           Margin="5"/>
+                <Border Height="10" />
                 <Grid ColumnDefinitions="*,*">
                     <GridSplitter ResizeDirection="Columns"/>
                    <StackPanel Grid.Column="0" >
-                       <TextBlock Margin="2" Text="Feat: Aim Piss" />
-                       <Border Margin="3" />
-                       <ComboBox  ItemsSource="{Binding Genitals}"
-                                  SelectedItem="{Binding SelectedBits}"
-                                  PlaceholderText="Select your bits"
-                                  SelectedValue="0"
-                                  x:Name="BitSelection"
-                                  SelectionChanged="SelectedBitsControl_OnSelectionChanged"
-                                  Margin="5"/>
-                       <ComboBox  ItemsSource="{Binding Models}"
-                                  SelectedItem="{Binding SelectedModels}"
-                                  PlaceholderText="Select your model"
-                                  Margin="5"/>
+                       <TextBlock Text="Models" />
+                       <ListBox  ItemsSource="{Binding ModelsList}"
+                                 SelectedItem="{Binding SelectedModels}"
+                                 Margin="5"
+                                 Height="110"/>
+                       <Border Height="10" />
+                       <TextBlock Text="Pubes" />
+                       <ListBox  ItemsSource="{Binding PubesList}"
+                                 SelectedItem="{Binding SelectedPubes}"
+                                 Margin="5"
+                                 Height="110"/>
                    </StackPanel>
                     <GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
                    <StackPanel Grid.Column="1">
-                       <TextBlock Margin="2" Text="Bio-Essence: 10" />
-                       <Border Margin="3" />
-                       <ComboBox ItemsSource="{Binding Styles}"
-                                 SelectedItem="{Binding SelectedStyles}"
-                                 PlaceholderText="Select your style"
-                                 Margin="5"/>
-                       <!-- <ComboBox ItemsSource="{Binding Cyberware}"
+                       <TextBlock Text="Aesthetics" />
+                       <ListBox ItemsSource="{Binding AestheticsList}"
+                                 SelectedItem="{Binding SelectedAesthetics}"
+                                 Margin="5"
+                                 Height="110"/>
+                       <Border Height="10" />
+                       <TextBlock Text="CyberwareList" />
+                       <ListBox ItemsSource="{Binding CyberwareList}"
                                  SelectedItem="{Binding SelectedCyberware}"
-                                 PlaceholderText="Select your Cyberware"
-                                 Margin="5"/> -->
+                                 Margin="5"
+                                 Height="110" />
                    </StackPanel>
                 </Grid>
             </StackPanel>