🐛 修复列表显示不全的bug

selfcan · Apr 17, 2023 · 6072832 · 6072832
1 parent dd41635
commit 6072832
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Constant/WidthTypeEnum.cs b/Constant/WidthTypeEnum.cs
@@ -14,5 +14,6 @@ public enum WidthTypeEnum
         RIGHT_CARD_HALF_TEXT = 3, //右侧托盘宽度的一半 再减去左侧图像宽度
         RIGHT_CARD_20 = 4, //右侧托盘宽度 - 20
         RIGHT_CARD_40 = 5, //右侧托盘宽度 - 40
+        RIGHT_CARD_70 = 6, //右侧托盘宽度 - 70
     }
 }
diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml
@@ -186,9 +186,7 @@
                                                          >
                                             <Border BorderBrush="{TemplateBinding BorderBrush}" 
                                                     BorderThickness="{TemplateBinding BorderBrush}"
-                                                    Width="{Binding AppConfig.WindowWidth, Mode=OneWay, 
-                                                Converter={StaticResource GetWidthByWWConvert}, 
-                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_40}}"
+
                                                     >
                                                 <ItemsPresenter/>
                                             </Border>
@@ -212,7 +210,7 @@
                                                                     VirtualizingPanel.ScrollUnit="Pixel"
                                                 Width="{Binding AppConfig.WindowWidth, Mode=OneWay, 
                                                 Converter={StaticResource GetWidthByWWConvert}, 
-                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_40}}"
+                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD_70}}"
                                                 />
                                     </ItemsPanelTemplate>
                                 </ListBox.ItemsPanel>

diff --git a/Converts/GetWidthByWWConvert.cs b/Converts/GetWidthByWWConvert.cs
@@ -34,6 +34,14 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             {
                 return (config.WindowWidth - config.MenuCardWidth) - 20;
             }
+            else if (WidthTypeEnum.RIGHT_CARD_40 == type)
+            {
+                return (config.WindowWidth - config.MenuCardWidth) - 40;
+            }
+            else if (WidthTypeEnum.RIGHT_CARD_70 == type)
+            {
+                return (config.WindowWidth - config.MenuCardWidth) - 70;
+            }
 
             return config.WindowWidth;
         }