Debugging bug #17

DogOSdev · Apr 23, 2022 · 6d3bcc4 · 6d3bcc4
1 parent a3cf16e
commit 6d3bcc4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/DogOS/DogOS.csproj b/DogOS/DogOS.csproj
@@ -73,6 +73,27 @@
 		<HyperV_ExtractMapFile>False</HyperV_ExtractMapFile>
 		<Bochs_VMwareEdition>Workstation</Bochs_VMwareEdition>
 		<EnableBochsDebug>False</EnableBochsDebug>
+		<Bochs_EnableBochsDebug>False</Bochs_EnableBochsDebug>
+		<USB_StackCorruptionDetectionEnabled>True</USB_StackCorruptionDetectionEnabled>
+		<USB_StackCorruptionDetectionLevel>AllInstructions</USB_StackCorruptionDetectionLevel>
+		<USB_Name>Bochs User 001</USB_Name>
+		<USB_Description>Makes a USB device such as a flash drive or external hard disk bootable.</USB_Description>
+		<USB_Deployment>USB</USB_Deployment>
+		<USB_Launch>None</USB_Launch>
+		<USB_DebugEnabled>False</USB_DebugEnabled>
+		<USB_DebugMode>Source</USB_DebugMode>
+		<USB_IgnoreDebugStubAttribute>False</USB_IgnoreDebugStubAttribute>
+		<USB_CosmosDebugPort>Serial: COM1</USB_CosmosDebugPort>
+		<USB_VisualStudioDebugPort>Pipe: Cosmos\Serial</USB_VisualStudioDebugPort>
+		<USB_PxeInterface>192.168.0.8</USB_PxeInterface>
+		<USB_VMwareEdition>Workstation</USB_VMwareEdition>
+		<USB_EnableGDB>False</USB_EnableGDB>
+		<USB_StartCosmosGDB>False</USB_StartCosmosGDB>
+		<USB_EnableBochsDebug>False</USB_EnableBochsDebug>
+		<USB_ISOFile>bin\Debug\net5.0\DogOS.iso</USB_ISOFile>
+		<USB_CompileVBEMultiboot>False</USB_CompileVBEMultiboot>
+		<USB_ExtractMapFile>False</USB_ExtractMapFile>
+		<VMware_EnableBochsDebug>False</VMware_EnableBochsDebug>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git 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
@@ -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
@@ -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
@@ -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