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

增加粉色

Browse Source
This commit is contained in:
Leonmmcoset
2026-04-04 14:27:37 +08:00
parent 121d30f403
commit 218ec19559
5 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BuildTime.txt
View File

@@ -1 +1 @@
2026-04-04 13:54:37 2026-04-04 14:22:16

2
GitCommit.txt
View File

@@ -1 +1 @@
2f9df41 121d30f

15
Gui/UILib/Dropdown.cs
View File

@@ -11,7 +11,7 @@ namespace CMLeonOS.Gui.UILib
{ {
hostWindow = parent; hostWindow = parent;
OnClick = (_, _) => ToggleExpanded(); OnClick = (_, _) => ToggleExpanded();
OnUnfocused = Collapse; OnUnfocused = HandleUnfocused;
} }
private readonly Window hostWindow; private readonly Window hostWindow;
@@ -149,6 +149,17 @@ namespace CMLeonOS.Gui.UILib
Render(); Render();
} }
private void HandleUnfocused()
{
Window nextFocus = WM.PendingFocusTarget;
if (nextFocus == popupTable || nextFocus == popupWindow)
{
return;
}
Collapse();
}
private void ToggleExpanded() private void ToggleExpanded()
{ {
if (Expanded) if (Expanded)
@@ -288,6 +299,8 @@ namespace CMLeonOS.Gui.UILib
popupTable.SelectedBorder = Highlight; popupTable.SelectedBorder = Highlight;
popupTable.SelectedForeground = Foreground; popupTable.SelectedForeground = Foreground;
popupTable.TableCellSelected = PopupSelected; popupTable.TableCellSelected = PopupSelected;
popupTable.OnUnfocused = Collapse;
popupWindow.OnUnfocused = Collapse;
for (int i = 0; i < Items.Count; i++) for (int i = 0; i < Items.Count; i++)
{ {

24
Gui/UILib/UITheme.cs
View File

@@ -43,7 +43,7 @@ namespace CMLeonOS.Gui.UILib
internal static string[] GetThemeNames() internal static string[] GetThemeNames()
{ {
return new string[] { "Default", "Graphite", "Forest", "Sunset", "Rose", "Terminal" }; return new string[] { "Default", "Graphite", "Forest", "Sunset", "Rose", "Pink", "Terminal" };
} }
internal static void ApplyTheme(string themeName) internal static void ApplyTheme(string themeName)
@@ -140,6 +140,28 @@ namespace CMLeonOS.Gui.UILib
CurrentThemeName = "Rose"; CurrentThemeName = "Rose";
break; break;
case "Pink":
WindowTitleBackground = Color.FromArgb(106, 34, 82);
WindowTitleTopHighlight = Color.FromArgb(156, 74, 128);
WindowTitleBottomBorder = Color.FromArgb(58, 17, 44);
WindowTitleText = Color.FromArgb(255, 242, 250);
WindowButtonBackground = Color.FromArgb(132, 52, 104);
Surface = Color.FromArgb(255, 244, 250);
SurfaceMuted = Color.FromArgb(246, 226, 238);
SurfaceBorder = Color.FromArgb(198, 154, 178);
TextPrimary = Color.FromArgb(84, 32, 64);
TextSecondary = Color.FromArgb(136, 92, 116);
Accent = Color.FromArgb(232, 84, 164);
AccentDark = Color.FromArgb(191, 56, 129);
AccentLight = Color.FromArgb(255, 212, 236);
Success = Color.FromArgb(72, 161, 118);
Warning = Color.FromArgb(216, 142, 65);
CurrentThemeName = "Pink";
break;
case "Terminal": case "Terminal":
WindowTitleBackground = Color.FromArgb(14, 22, 14); WindowTitleBackground = Color.FromArgb(14, 22, 14);
WindowTitleTopHighlight = Color.FromArgb(33, 60, 33); WindowTitleTopHighlight = Color.FromArgb(33, 60, 33);

4
Gui/WindowManager.cs
View File

@@ -59,6 +59,7 @@ namespace CMLeonOS.Gui
internal uint ScreenHeight { get; private set; } internal uint ScreenHeight { get; private set; }
internal Window Focus { get; set; } internal Window Focus { get; set; }
internal Window PendingFocusTarget { get; private set; }
private uint bytesPerPixel { get; set; } private uint bytesPerPixel { get; set; }
@@ -233,6 +234,8 @@ namespace CMLeonOS.Gui
return; return;
} }
PendingFocusTarget = window;
if (Focus != null && Focus != window) if (Focus != null && Focus != window)
{ {
Focus.OnUnfocused?.Invoke(); Focus.OnUnfocused?.Invoke();
@@ -240,6 +243,7 @@ namespace CMLeonOS.Gui
Focus = window; Focus = window;
window.OnFocused?.Invoke(); window.OnFocused?.Invoke();
PendingFocusTarget = null;
if (updateDock) if (updateDock)
{ {