Adjust UI Layouts

CollapseLauncher · Jul 28, 2024 · 3697843 · 3697843
1 parent 0a4fa24
commit 3697843
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 56 deletions.
diff --git a/CollapseLauncher/App.xaml b/CollapseLauncher/App.xaml
@@ -420,7 +420,7 @@
                             <AcrylicBrush x:Key="SocMedPanelAcrylicBrush"
                                           FallbackColor="#CCEEEEEE"
                                           TintColor="#EEEEEE"
-                                          TintLuminosityOpacity="0.75"
+                                          TintLuminosityOpacity="0.6"
                                           TintOpacity="0"/>
                             <AcrylicBrush x:Key="WebView2GridBackground"
                                           FallbackColor="#EEEAEAEA"
@@ -490,7 +490,7 @@
                                                  StartPoint="0,0"
                                                  EndPoint="0.15,0">
                                 <GradientStop Offset="0"
-                                              Color="#2DFFFFFF"/>
+                                              Color="#44FFFFFF"/>
                                 <GradientStop Offset="1"
                                               Color="#00FFFFFF"/>
                             </LinearGradientBrush>

diff --git a/CollapseLauncher/Classes/Properties/WindowSizeProp/WindowSizeProp.cs b/CollapseLauncher/Classes/Properties/WindowSizeProp/WindowSizeProp.cs
@@ -30,20 +30,20 @@ Dictionary<string, WindowSizeProp> WindowSizeProfiles
                     SidePanel1Width               = new GridLength(340, GridUnitType.Pixel),
                     EventPostCarouselBounds       = new Size(340,  158),
                     PostPanelBounds               = new Size(340,  120),
-                    PostPanelBottomMargin         = new Thickness(0, 0, 0, 52),
+                    PostPanelBottomMargin         = new Thickness(0, 0, 0, 24),
                     PostPanelPaimonHeight         = 138,
-                    PostPanelPaimonMargin         = new Thickness(0, -48, -32, 0),
-                    PostPanelPaimonInnerMargin    = new Thickness(0, 0,   0,   48),
-                    PostPanelPaimonTextMargin     = new Thickness(0, 0,   142, 0),
+                    PostPanelPaimonMargin         = new Thickness(0, -48, -64, 0),
+                    PostPanelPaimonInnerMargin    = new Thickness(0, 0,   0,   0),
+                    PostPanelPaimonTextMargin     = new Thickness(0, 0,   8,  28),
                     PostPanelPaimonTextSize       = 14,
                     BannerIconWidth               = 136,
                     BannerIconWidthHYP            = 110,
                     BannerIconMargin              = new Thickness(0, 0, 94, 84),
-                    BannerIconMarginHYP           = new Thickness(48, 0, 0, 28),
+                    BannerIconMarginHYP           = new Thickness(48, 232, 0, 0),
                     BannerIconAlignHorizontal     = HorizontalAlignment.Right,
                     BannerIconAlignHorizontalHYP  = HorizontalAlignment.Left,
                     BannerIconAlignVertical       = VerticalAlignment.Bottom,
-                    BannerIconAlignVerticalHYP    = VerticalAlignment.Bottom,
+                    BannerIconAlignVerticalHYP    = VerticalAlignment.Top,
                     SettingsPanelWidth            = 676
                 }
             },
@@ -56,20 +56,20 @@ Dictionary<string, WindowSizeProp> WindowSizeProfiles
                     SidePanel1Width               = new GridLength(280, GridUnitType.Pixel),
                     EventPostCarouselBounds       = new Size(280,  130),
                     PostPanelBounds               = new Size(280,  98),
-                    PostPanelBottomMargin         = new Thickness(0, 0, 0, 48),
-                    PostPanelPaimonHeight         = 128,
-                    PostPanelPaimonMargin         = new Thickness(0, -48, -32, 0),
-                    PostPanelPaimonInnerMargin    = new Thickness(0, 0,   0,   48),
-                    PostPanelPaimonTextMargin     = new Thickness(0, 0,   142, 0),
+                    PostPanelBottomMargin         = new Thickness(0, 0, 0, 12),
+                    PostPanelPaimonHeight         = 110,
+                    PostPanelPaimonMargin         = new Thickness(0, -48, -56, 0),
+                    PostPanelPaimonInnerMargin    = new Thickness(0, 0,   0,   0),
+                    PostPanelPaimonTextMargin     = new Thickness(0, 0,   0,   18),
                     PostPanelPaimonTextSize       = 11,
                     BannerIconWidth               = 100,
                     BannerIconWidthHYP            = 86,
                     BannerIconMargin              = new Thickness(0, 0, 70, 52),
-                    BannerIconMarginHYP           = new Thickness(24, 0, 0, 8),
+                    BannerIconMarginHYP           = new Thickness(24, 170, 0, 0),
                     BannerIconAlignHorizontal     = HorizontalAlignment.Right,
                     BannerIconAlignHorizontalHYP  = HorizontalAlignment.Left,
                     BannerIconAlignVertical       = VerticalAlignment.Bottom,
-                    BannerIconAlignVerticalHYP    = VerticalAlignment.Bottom,
+                    BannerIconAlignVerticalHYP    = VerticalAlignment.Top,
                     SettingsPanelWidth            = 464
                 }
             }

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.Variable.cs b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.Variable.cs
@@ -30,6 +30,10 @@ public sealed partial class HomePage : Page
         public Visibility IsPostNoticePanelEmpty => (GameNewsData?.NewsPostTypeAnnouncement?.Count ?? 0) != 0 ? Visibility.Collapsed : Visibility.Visible;
         public Visibility IsPostInfoPanelVisible => (GameNewsData?.NewsPostTypeInfo?.Count ?? 0) == 0 ? Visibility.Collapsed : Visibility.Visible;
         public Visibility IsPostInfoPanelEmpty => (GameNewsData?.NewsPostTypeInfo?.Count ?? 0) != 0 ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility IsPostInfoPanelAllEmpty =>
+            IsPostEventPanelVisible == Visibility.Collapsed
+            && IsPostEventPanelVisible == Visibility.Collapsed
+            && IsPostEventPanelVisible == Visibility.Collapsed ? Visibility.Collapsed : Visibility.Visible;
         public int PostEmptyMascotTextWidth => Locale.Lang._HomePage.PostPanel_NoNews.Length > 30 ? 200 : 100;
 #nullable restore