From 3654ec393a9236897023db39179b9692ef13280b Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Tue, 4 Apr 2023 13:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20=E8=B0=83=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E9=80=82=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/PannelCard/RightCardControl.xaml | 8 ++++++--
 Converts/GetWidthByWWConvert.cs                       | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Control/UserControls/PannelCard/RightCardControl.xaml b/Control/UserControls/PannelCard/RightCardControl.xaml
index f5ee134..d9ae435 100644
--- a/Control/UserControls/PannelCard/RightCardControl.xaml
+++ b/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>
diff --git a/Converts/GetWidthByWWConvert.cs b/Converts/GetWidthByWWConvert.cs
index ea893a6..56cd4ed 100644
--- a/Converts/GetWidthByWWConvert.cs
+++ b/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;