diff --git a/DogOS/DogOS.csproj b/DogOS/DogOS.csproj index 252b2b9..4d5d21c 100644 --- a/DogOS/DogOS.csproj +++ b/DogOS/DogOS.csproj @@ -73,6 +73,27 @@ False Workstation False + False + True + AllInstructions + Bochs User 001 + Makes a USB device such as a flash drive or external hard disk bootable. + USB + None + False + Source + False + Serial: COM1 + Pipe: Cosmos\Serial + 192.168.0.8 + Workstation + False + False + False + bin\Debug\net5.0\DogOS.iso + False + False + False diff --git a/DogOS/GUI/CompositeWidget.cs b/DogOS/GUI/CompositeWidget.cs index f8db563..f0148ed 100644 --- a/DogOS/GUI/CompositeWidget.cs +++ b/DogOS/GUI/CompositeWidget.cs @@ -37,6 +37,8 @@ public void AddChild(Widget child) public new void OnMouseDown(int x, int y, MouseState button) { + base.OnMouseDown(x, y, button); + foreach (var child in children) { if(child.ContainsCoordinate(x - this.x, y - this.y)) diff --git a/DogOS/GUI/Desktop.cs b/DogOS/GUI/Desktop.cs index 43661cd..dd63a3c 100644 --- a/DogOS/GUI/Desktop.cs +++ b/DogOS/GUI/Desktop.cs @@ -29,7 +29,7 @@ public Desktop(int w, int h, Color color) : base(null, 0, 0, w, h, color) public void Draw() { base.Draw(canvas); - Pen pen = new Pen(Color.White); + Pen pen = new Pen(Kernel.mc); for (int i = 0; i < 4; i++) { diff --git a/DogOS/GUI/Window.cs b/DogOS/GUI/Window.cs index aaf00e9..69d0c15 100644 --- a/DogOS/GUI/Window.cs +++ b/DogOS/GUI/Window.cs @@ -12,14 +12,12 @@ public Window(Widget parent, int x, int y, int w, int h, Color color) : base(par public new void OnMouseDown(int x, int y, MouseState button) { base.OnMouseDown(x, y, button); - dragging = button == MouseState.Left; } public new void OnMouseUp(int x, int y, MouseState button) { base.OnMouseUp(x, y, button); - dragging = false; } diff --git a/DogOS/Kernel.cs b/DogOS/Kernel.cs index 2b03624..a69f7d6 100644 --- a/DogOS/Kernel.cs +++ b/DogOS/Kernel.cs @@ -28,6 +28,7 @@ public class Kernel : Sys.Kernel public static System.Drawing.Color background = System.Drawing.Color.Blue; public static GUI.Desktop desktop; + public static System.Drawing.Color mc = System.Drawing.Color.White; #endregion