From b607cee75ca982fa4f1ad21e0e1fc406daddb1fb Mon Sep 17 00:00:00 2001
From: Leonmmcoset <testmod@qq.com>
Date: Wed, 25 Mar 2026 21:47:29 +0800
Subject: [PATCH] =?UTF-8?q?Dropdown=E5=A2=9E=E5=8A=A0=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BuildTime.txt         |  2 +-
 GitCommit.txt         |  2 +-
 Gui/UILib/Dropdown.cs | 77 ++++++++++++++++++++++++++++++++++---------
 3 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/BuildTime.txt b/BuildTime.txt
index ee341bb..91cfde1 100644
--- a/BuildTime.txt
+++ b/BuildTime.txt
@@ -1 +1 @@
-2026-03-25 21:37:54
\ No newline at end of file
+2026-03-25 21:44:57
\ No newline at end of file
diff --git a/GitCommit.txt b/GitCommit.txt
index 9d6d126..a255276 100644
--- a/GitCommit.txt
+++ b/GitCommit.txt
@@ -1 +1 @@
-d009660
\ No newline at end of file
+b964430
\ No newline at end of file
diff --git a/Gui/UILib/Dropdown.cs b/Gui/UILib/Dropdown.cs
index 5629c52..46d1b72 100644
--- a/Gui/UILib/Dropdown.cs
+++ b/Gui/UILib/Dropdown.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using CMLeonOS.UILib.Animations;
 
 namespace CMLeonOS.Gui.UILib
 {
@@ -16,6 +17,7 @@ namespace CMLeonOS.Gui.UILib
         private readonly Window hostWindow;
         private Window popupWindow;
         private Table popupTable;
+        private bool closeAnimationRunning = false;
 
         internal Action<int, string> SelectionChanged;
 
@@ -173,25 +175,47 @@ namespace CMLeonOS.Gui.UILib
 
         internal void Collapse()
         {
-            if (!Expanded)
+            if (!Expanded || closeAnimationRunning)
             {
                 return;
             }
 
-            Expanded = false;
-
-            if (popupTable != null)
+            if (popupWindow == null)
             {
-                WM.RemoveWindow(popupTable);
-                popupTable = null;
-            }
-            if (popupWindow != null)
-            {
-                WM.RemoveWindow(popupWindow);
-                popupWindow = null;
+                Expanded = false;
+                Render();
+                return;
             }
 
-            Render();
+            closeAnimationRunning = true;
+
+            int currentHeight = popupWindow.Height;
+            MovementAnimation animation = new MovementAnimation(popupWindow)
+            {
+                From = new Rectangle(popupWindow.X, popupWindow.Y, popupWindow.Width, currentHeight),
+                To = new Rectangle(popupWindow.X, popupWindow.Y, popupWindow.Width, 1),
+                Duration = 8,
+                EasingType = EasingType.Sine,
+                EasingDirection = EasingDirection.In
+            };
+            animation.Completed = () =>
+            {
+                if (popupTable != null)
+                {
+                    WM.RemoveWindow(popupTable);
+                    popupTable = null;
+                }
+                if (popupWindow != null)
+                {
+                    WM.RemoveWindow(popupWindow);
+                    popupWindow = null;
+                }
+
+                Expanded = false;
+                closeAnimationRunning = false;
+                Render();
+            };
+            animation.Start();
         }
 
         private void PopupSelected(int index)
@@ -236,12 +260,11 @@ namespace CMLeonOS.Gui.UILib
             int visibleItems = Math.Max(1, Math.Min(MaxVisibleItems, Math.Max(1, Items.Count)));
             int popupHeight = Math.Max(24, visibleItems * 22);
 
-            popupWindow = new Window(Process, hostWindow, X, Y + Height, Width, popupHeight);
+            popupWindow = new Window(Process, hostWindow, X, Y + Height, Width, 1);
             popupWindow.Clear(UITheme.Surface);
-            popupWindow.DrawRectangle(0, 0, popupWindow.Width, popupWindow.Height, Border);
             WM.AddWindow(popupWindow);
 
-            popupTable = new Table(popupWindow, 0, 0, popupWindow.Width, popupWindow.Height);
+            popupTable = new Table(popupWindow, 0, 0, popupWindow.Width, popupHeight);
             popupTable.AllowDeselection = false;
             popupTable.CellHeight = 22;
             popupTable.Background = UITheme.Surface;
@@ -260,6 +283,30 @@ namespace CMLeonOS.Gui.UILib
             popupTable.SelectedCellIndex = _selectedIndex;
             popupTable.Render();
             WM.AddWindow(popupTable);
+
+            MovementAnimation animation = new MovementAnimation(popupWindow)
+            {
+                From = new Rectangle(popupWindow.X, popupWindow.Y, popupWindow.Width, 1),
+                To = new Rectangle(popupWindow.X, popupWindow.Y, popupWindow.Width, popupHeight),
+                Duration = 8,
+                EasingType = EasingType.Sine,
+                EasingDirection = EasingDirection.Out
+            };
+            animation.Completed = () =>
+            {
+                if (popupWindow != null)
+                {
+                    popupWindow.Clear(UITheme.Surface);
+                    popupWindow.DrawRectangle(0, 0, popupWindow.Width, popupWindow.Height, Border);
+                    WM.Update(popupWindow);
+                }
+                if (popupTable != null)
+                {
+                    popupTable.MoveAndResize(0, 0, popupWindow.Width, popupWindow.Height, sendWMEvent: false);
+                    popupTable.Render();
+                }
+            };
+            animation.Start();
         }
 
         internal override void Render()