diff options
| author | MichaelTheShifter <[email protected]> | 2016-07-20 10:04:18 -0400 |
|---|---|---|
| committer | MichaelTheShifter <[email protected]> | 2016-07-20 10:04:18 -0400 |
| commit | 995b1404e0966950f53447383da4c5f91bd2cdb0 (patch) | |
| tree | f0b325344c3f2c7cb7895cc67fa81fae421ffbb0 | |
| parent | d40fed5ce2bc806a91245adb18039634eac13ed0 (diff) | |
| download | shiftos-c--995b1404e0966950f53447383da4c5f91bd2cdb0.tar.gz shiftos-c--995b1404e0966950f53447383da4c5f91bd2cdb0.tar.bz2 shiftos-c--995b1404e0966950f53447383da4c5f91bd2cdb0.zip | |
Fix window border bug, add skinnable VisualStyleBorders
| -rw-r--r-- | source/ShiftUI/Theming/ShiftOS.cs | 2 | ||||
| -rw-r--r-- | source/ShiftUI/Theming/ThemeSkinnable.cs | 2 | ||||
| -rw-r--r-- | source/WindowsFormsApplication1/API.cs | 1 | ||||
| -rw-r--r-- | source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs | 1 |
4 files changed, 5 insertions, 1 deletions
diff --git a/source/ShiftUI/Theming/ShiftOS.cs b/source/ShiftUI/Theming/ShiftOS.cs index 1cc00e1..1004a45 100644 --- a/source/ShiftUI/Theming/ShiftOS.cs +++ b/source/ShiftUI/Theming/ShiftOS.cs @@ -18,6 +18,8 @@ namespace ShiftUI.ShiftOS #region Global public string DefaultFont = "Microsoft Sans Serif"; + public Color VisualStyleBorderColor = Color.Black; + public int VisualStyleBorderWidth = 2; public int DefaultFontSize = 9; public FontStyle DefaultFontStyle = FontStyle.Regular; public Color WindowBackColor = Color.Gray; diff --git a/source/ShiftUI/Theming/ThemeSkinnable.cs b/source/ShiftUI/Theming/ThemeSkinnable.cs index bf8b56f..ede3aa9 100644 --- a/source/ShiftUI/Theming/ThemeSkinnable.cs +++ b/source/ShiftUI/Theming/ThemeSkinnable.cs @@ -7935,7 +7935,7 @@ namespace ShiftUI public override void CPDrawVisualStyleBorder(Graphics graphics, Rectangle bounds) { - graphics.DrawRectangle(SystemPens.ControlDarkDark, bounds); + graphics.DrawRectangle(new System.Drawing.Pen(new SolidBrush(Application.CurrentSkin.VisualStyleBorderColor), Application.CurrentSkin.VisualStyleBorderWidth), bounds); } private static void DrawBorderInternal(Graphics graphics, int startX, int startY, int endX, int endY, diff --git a/source/WindowsFormsApplication1/API.cs b/source/WindowsFormsApplication1/API.cs index 6ce59f3..4434fc7 100644 --- a/source/WindowsFormsApplication1/API.cs +++ b/source/WindowsFormsApplication1/API.cs @@ -1089,6 +1089,7 @@ namespace ShiftOS brdr.Dock = DockStyle.Fill; formToCreate.Body.BorderStyle = BorderStyle.None; brdr.setupall(); + formToCreate.FormBorderStyle = FormBorderStyle.None; } /// <summary> diff --git a/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs b/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs index 3484096..f22811f 100644 --- a/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs +++ b/source/WindowsFormsApplication1/Apps/File Skimmer.Designer.cs @@ -192,6 +192,7 @@ // imgtypes // this.imgtypes.TransparentColor = System.Drawing.Color.Transparent; + this.imgtypes.ImageSize = new System.Drawing.Size(48, 48); //this.imgtypes.Images.SetKeyName(0, "application"); //this.imgtypes.Images.SetKeyName(1, "package"); //this.imgtypes.Images.SetKeyName(2, "none"); |