Browse Source

✅ 调整合适宽度

BookerLiu 2 years ago
parent
commit
3654ec393a

+ 6 - 2
Control/UserControls/PannelCard/RightCardControl.xaml

@@ -182,9 +182,13 @@
                                                          CanContentScroll="True"
                                                          PreviewMouseWheel="IconListBox_MouseWheel"
                                                          >
-                                            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderBrush}">
+                                            <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                                                    BorderThickness="{TemplateBinding BorderBrush}"
+                                                    Width="{Binding AppConfig.WindowWidth, Mode=OneWay, 
+                                                Converter={StaticResource GetWidthByWWConvert}, 
+                                                ConverterParameter={x:Static cst:WidthTypeEnum.RIGHT_CARD}}"
+                                                    >
                                                 <ItemsPresenter/>
-
                                             </Border>
                                         </hc:ScrollViewer>
                                     </ControlTemplate>

+ 2 - 2
Converts/GetWidthByWWConvert.cs

@@ -26,10 +26,10 @@ namespace GeekDesk.Converts
                 return config.WindowWidth - config.MenuCardWidth;
             } else if (WidthTypeEnum.RIGHT_CARD_HALF == type)
             {
-                return (config.WindowWidth - config.MenuCardWidth) * 0.8;
+                return (config.WindowWidth - config.MenuCardWidth) * 0.618;
             } else if (WidthTypeEnum.RIGHT_CARD_HALF_TEXT == type)
             {
-                return (config.WindowWidth - config.MenuCardWidth) * 0.8 - config.ImageWidth - 20;
+                return (config.WindowWidth - config.MenuCardWidth) * 0.618 - config.ImageWidth - 20;
             }
 
             return config.WindowWidth;