Add dpi and optimize ui.

kkwpsv · Jun 17, 2022 · d6186b4 · d6186b4
1 parent 3c9d734
commit d6186b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/WindowDebugger/ViewModels/WindowItem.cs b/WindowDebugger/ViewModels/WindowItem.cs
@@ -112,6 +112,8 @@ public WindowDisplayAffinities WindowDisplayAffinity
 
         public DPI_AWARENESS DpiAwareness => GetWithDefaultValueWhenException(() => _window.DpiAwareness, DPI_AWARENESS_UNAWARE);
 
+        public int Dpi => _window.Dpi;
+
         public IntPtr ParentWindowHandle
         {
             get => _window.ParentWindowHandle;

diff --git a/WindowDebugger/Views/Tabs/WindowInfoTab.xaml b/WindowDebugger/Views/Tabs/WindowInfoTab.xaml
@@ -30,15 +30,12 @@
                     <ColumnDefinition Width="2*" MinWidth="200"/>
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="42" />
+                    <RowDefinition Height="42" />
+                    <RowDefinition Height="42" />
+                    <RowDefinition Height="42" />
+                    <RowDefinition Height="42" />
+                    <RowDefinition Height="42" />
                 </Grid.RowDefinitions>
                 <FrameworkElement.Resources>
                     <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
@@ -48,7 +45,7 @@
                         <Setter Property="Background" Value="Transparent" />
                     </Style>
                 </FrameworkElement.Resources>
-                <Border Grid.Row="0" Grid.RowSpan="20" Grid.Column="2" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}"
+                <Border Grid.Row="0" Grid.RowSpan="6" Grid.Column="2" BorderThickness="1" BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                         HorizontalAlignment="Center" VerticalAlignment="Top" Margin="16 4 4 0" MaxHeight="320">
                     <Image Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" Source="{Binding Screenshot}" RenderOptions.BitmapScalingMode="Fant"/>
                 </Border>
@@ -67,6 +64,8 @@
                 <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding ClassName, Mode=OneWay}" IsReadOnly="True"/>
                 <TextBlock Grid.Row="4" Grid.Column="0" Text="DpiAwareness"/>
                 <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DpiAwareness, Mode=OneWay}" IsReadOnly="True"/>
+                <TextBlock Grid.Row="5" Grid.Column="0" Text="Dpi"/>
+                <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding Dpi, Mode=OneWay}" IsReadOnly="True"/>
             </Grid>
             <Border Height="1" Background="{DynamicResource ControlElevationBorderBrush}" Margin="0 16" />
             <Grid>

diff --git a/WindowDebugger/WindowDebugger.csproj b/WindowDebugger/WindowDebugger.csproj
@@ -17,9 +17,9 @@
 
   <ItemGroup>
     <PackageReference Include="Lsj.Util.JSON" Version="6.0.0" />
-    <PackageReference Include="Lsj.Util.Win32" Version="6.2.1" />
+    <PackageReference Include="Lsj.Util.Win32" Version="6.2.2-debug2080" />
     <PackageReference Include="Lsj.Util.WPF" Version="6.0.0" />
-    <PackageReference Include="Lsj.Util.Win32.NativeUI" Version="6.0.4" />
+    <PackageReference Include="Lsj.Util.Win32.NativeUI" Version="6.0.5-debug2080" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="WPF-UI" Version="1.2.6" />
   </ItemGroup>