LeonMMcoset/CMLeonOS
1
0
Fork 0
mirror of https://github.com/Leonmmcoset/CMLeonOS.git synced 2026-04-21 19:24:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
Leonmmcoset
2026-03-24 17:24:16 +08:00
parent 78ebe0c2a6
commit 5fd826ab54
5 changed files with 68 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Gui/UILib/AppWindow.cs
View File

@@ -19,6 +19,7 @@ using Cosmos.System.Graphics;
using CMLeonOS;
using CMLeonOS.Gui.ShellComponents.Dock;
using CMLeonOS.Gui.SmoothMono;
using CMLeonOS.UILib.Animations;
using System;
using System.Drawing;
@@ -41,6 +42,7 @@ namespace CMLeonOS.Gui.UILib
Icon = defaultAppIconBitmap;
RenderDecoration();
StartOpenAnimation();
}
[IL2CPU.API.Attribs.ManifestResourceStream(ResourceName = "CMLeonOS.Gui.Resources.Close.bmp")]
@@ -147,18 +149,73 @@ namespace CMLeonOS.Gui.UILib
private WindowManager wm;
private bool maximised = false;
private bool closeAnimationRunning = false;
private int originalX;
private int originalY;
private int originalWidth;
private int originalHeight;
private void StartOpenAnimation()
{
int targetY = Y;
int offsetY = Math.Min(18, Math.Max(8, Height / 12));
Move(X, targetY + offsetY, sendWMEvent: false);
MovementAnimation animation = new MovementAnimation(this)
{
From = new Rectangle(X, Y, Width, Height),
To = new Rectangle(X, targetY, Width, Height),
Duration = 12,
EasingType = EasingType.Sine,
EasingDirection = EasingDirection.Out
};
animation.Start();
}
private void StartCloseAnimation()
{
if (closeAnimationRunning)
{
return;
}
closeAnimationRunning = true;
int offsetY = Math.Min(18, Math.Max(8, Height / 12));
int startX = X;
int startY = Y;
int startWidth = Width;
int startHeight = Height;
MovementAnimation animation = new MovementAnimation(this)
{
From = new Rectangle(startX, startY, startWidth, startHeight),
To = new Rectangle(startX, startY + offsetY, startWidth, startHeight),
Duration = 10,
EasingType = EasingType.Sine,
EasingDirection = EasingDirection.In
};
animation.Completed = () =>
{
Closing?.Invoke();
wm.RemoveWindow(this);
closeAnimationRunning = false;
};
animation.Start();
}
private void DecorationClicked(int x, int y)
{
if (closeAnimationRunning)
{
return;
}
if (x >= Width - titlebarHeight && _canClose)
{
// Close.
Closing?.Invoke();
wm.RemoveWindow(this);
StartCloseAnimation();
}
else if (x >= Width - (titlebarHeight * (_canClose ? 2 : 1)) && _canResize)
{
@@ -218,6 +275,7 @@ namespace CMLeonOS.Gui.UILib
buttonSpace += titlebarHeight;
}
if (x >= Width - buttonSpace || maximised || !_canMove) return;
if (closeAnimationRunning) return;
uint startMouseX = MouseManager.X;
uint startMouseY = MouseManager.Y;