- Fix Position

- Improve display
damienleroy · Dec 29, 2022 · 663d590 · 663d590
1 parent a374b3e
commit 663d590
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 14 deletions.
diff --git a/PowerAccent.Core/Models/Rect.cs b/PowerAccent.Core/Models/Rect.cs
@@ -56,4 +56,9 @@ public Rect(Point coord, Size size)
         }
         return new Rect(rect.X / divider.X, rect.Y / divider.Y, rect.Width / divider.Width, rect.Height / divider.Height);
     }
+
+    public override string ToString()
+    {
+        return $"X: {X}, Y: {Y}, Width: {Width}, Height: {Height}";
+    }
 }
diff --git a/PowerAccent.Core/Models/Size.cs b/PowerAccent.Core/Models/Size.cs
@@ -42,4 +42,9 @@ public Size(int width, int height)
         }
         return new Size(size.Width / divider.Width, size.Height / divider.Height);
     }
+
+    public override string ToString()
+    {
+        return $"Width: {Width}, Height: {Height}";
+    }
 }
diff --git a/PowerAccent.Core/PowerAccent.cs b/PowerAccent.Core/PowerAccent.cs
@@ -50,6 +50,7 @@ public Point GetDisplayCoordinates(Size window, double primaryDpi)
         Rect screen = new Rect(activeDisplay.Location, activeDisplay.Size) / primaryDpi;
         Position position = _settingService.Position;
 
+        Debug.WriteLine($"Window {window} - Screen {screen}");
         Debug.WriteLine($"Primary Dpi: {primaryDpi} - Screen Dpi: {activeDisplay.Dpi}");
 
         if (!_settingService.UseCaretPosition)
@@ -72,6 +73,16 @@ public char[] GetLettersFromKey(LetterKey letter)
         return _settingService.GetLetterKey(letter);
     }
 
+    public bool? IsLeftPosition()
+    {
+        return _settingService.Position switch
+        {
+            Position.Left or Position.TopLeft or Position.BottomLeft => true,
+            Position.Right or Position.TopRight or Position.BottomRight => false,
+            _ => null
+        };
+    }
+
     public void ReloadSettings()
     {
         _settingService.Reload();

diff --git a/PowerAccent.UI/MainWindow.xaml.cs b/PowerAccent.UI/MainWindow.xaml.cs
@@ -6,6 +6,7 @@
 using Size = PowerAccent.Core.Size;
 using Application = System.Windows.Application;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace PowerAccent.UI;
 
@@ -38,8 +39,8 @@ private void PowerAccent_OnChangeDisplay(bool isActive, char[] chars)
         if (isActive)
         {
             Selector selector = new Selector(chars);
-            CenterWindow(selector);
             selector.Show();
+            CenterWindow(selector);
             _selectorStack.Push(selector);
             _selector = selector;
         }
@@ -58,6 +59,7 @@ private void CenterWindow(Selector selector)
         double primaryDPI = Screen.PrimaryScreen.Bounds.Width / SystemParameters.PrimaryScreenWidth;
         Point position = _powerAccent.GetDisplayCoordinates(window, primaryDPI);
         selector.SetPosition(position.X, position.Y);
+        selector.SetBorderWindowAlignment(_powerAccent.IsLeftPosition());
     }
 
     #region TaskBar

diff --git a/PowerAccent.UI/Selector.xaml b/PowerAccent.UI/Selector.xaml
@@ -21,14 +21,8 @@
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />
             <Setter Property="VerticalContentAlignment" Value="Stretch" />
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="IsHitTestVisible" Value="False" />
-            <Setter Property="ItemsPanel">
-                <Setter.Value>
-                    <ItemsPanelTemplate>
-                        <VirtualizingStackPanel IsItemsHost="False" Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </Setter.Value>
-            </Setter>
+            <Setter Property="IsHitTestVisible" Value="True" />
+            <Setter Property="BorderThickness" Value="0" />
         </Style>
 
         <Style TargetType="ListBoxItem">
@@ -42,8 +36,7 @@
                             Margin="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            SnapsToDevicePixels="true"
-                            Style="{DynamicResource borderContent}">
+                            SnapsToDevicePixels="true">
                             <Rectangle
                                 x:Name="SelectionIndicator"
                                 Margin="7"
@@ -54,7 +47,6 @@
                                 RadiusY="4"
                                 Visibility="Collapsed" />
                             <ContentPresenter Margin="12" />
-
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsSelected" Value="true">
@@ -84,6 +76,11 @@
             <Grid>
                 <Border Background="{DynamicResource PrimaryBackgroundBrush}" CornerRadius="8">
                     <ListBox x:Name="characters">
+                        <ListBox.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <VirtualizingStackPanel IsItemsHost="False" Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListBox.ItemsPanel>
                     </ListBox>
                 </Border>
             </Grid>

diff --git a/PowerAccent.UI/Selector.xaml.cs b/PowerAccent.UI/Selector.xaml.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using PowerAccent.Core.Services;
+using PowerAccent.Core;
+using System.Windows;
 
 namespace PowerAccent.UI;
 
@@ -23,4 +25,14 @@ public void SetPosition(double left, double top)
         this.Left = left;
         this.Top = top;
     }
+
+    public void SetBorderWindowAlignment(bool? isLeft)
+    {
+        gridBorder.HorizontalAlignment = isLeft switch
+        {
+            true => HorizontalAlignment.Left,
+            false => HorizontalAlignment.Right,
+            _ => HorizontalAlignment.Center,
+        };
+    }
 }
diff --git a/PowerAccent.Wix/PowerAccent.Wix.SelfContained.wixproj b/PowerAccent.Wix/PowerAccent.Wix.SelfContained.wixproj
@@ -31,7 +31,7 @@
       <DoNotHarvest>True</DoNotHarvest>
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-      <TargetFrameworkIdentifier>net6.0-windows</TargetFrameworkIdentifier>
+      <TargetFrameworkIdentifier>net6.0-windows10.0.19041.0</TargetFrameworkIdentifier>
       <Runtime>win-x64</Runtime>
     </ProjectReference>
   </ItemGroup>