diff options
| author | Michael <[email protected]> | 2017-02-02 10:39:48 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-02-02 10:39:48 -0500 |
| commit | ce47589ce3f96b6674a1eecec14117536475db1e (patch) | |
| tree | 026cb967c87f3cc85167661242d645370472fb71 /ShiftOS.WinForms | |
| parent | bbe37edb68f9e7535216bff80ba3e6b16cbca398 (diff) | |
| download | shiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.tar.gz shiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.tar.bz2 shiftos_thereturn-ce47589ce3f96b6674a1eecec14117536475db1e.zip | |
Shiftnet style fixes
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Applications/Shiftnet.Designer.cs | 5 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/Shiftnet.cs | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ShiftOS.WinForms/Applications/Shiftnet.Designer.cs b/ShiftOS.WinForms/Applications/Shiftnet.Designer.cs index 8ac9ea5..eeb0439 100644 --- a/ShiftOS.WinForms/Applications/Shiftnet.Designer.cs +++ b/ShiftOS.WinForms/Applications/Shiftnet.Designer.cs @@ -81,7 +81,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.txturl.Location = new System.Drawing.Point(61, 3); this.txturl.Name = "txturl"; - this.txturl.Size = new System.Drawing.Size(702, 20); + this.txturl.Size = new System.Drawing.Size(678, 20); this.txturl.TabIndex = 2; this.txturl.WordWrap = false; this.txturl.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txturl_KeyDown); @@ -91,7 +91,7 @@ this.btngo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btngo.AutoSize = true; this.btngo.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.btngo.Location = new System.Drawing.Point(769, 3); + this.btngo.Location = new System.Drawing.Point(745, 3); this.btngo.Name = "btngo"; this.btngo.Size = new System.Drawing.Size(31, 23); this.btngo.TabIndex = 3; @@ -102,7 +102,6 @@ // wbcanvas // this.wbcanvas.Dock = System.Windows.Forms.DockStyle.Fill; - this.wbcanvas.IsWebBrowserContextMenuEnabled = false; this.wbcanvas.Location = new System.Drawing.Point(0, 29); this.wbcanvas.MinimumSize = new System.Drawing.Size(20, 20); this.wbcanvas.Name = "wbcanvas"; diff --git a/ShiftOS.WinForms/Applications/Shiftnet.cs b/ShiftOS.WinForms/Applications/Shiftnet.cs index d4183a4..2822948 100644 --- a/ShiftOS.WinForms/Applications/Shiftnet.cs +++ b/ShiftOS.WinForms/Applications/Shiftnet.cs @@ -43,27 +43,26 @@ namespace ShiftOS.WinForms.Applications string html = $@"<html> <head> <style> - <!-- Skin the web page --> body {{ background-color: rgb({LoadedSkin.ControlColor.R}, {LoadedSkin.ControlColor.G}, {LoadedSkin.ControlColor.B}); color: rgb({LoadedSkin.ControlTextColor.R}, {LoadedSkin.ControlTextColor.G}, {LoadedSkin.ControlTextColor.B}); font-family: ""{LoadedSkin.MainFont.Name}""; - font-size: {LoadedSkin.MainFont.Size}em; + font-size: {LoadedSkin.MainFont.SizeInPoints}pt; }} h1 {{ font-family: ""{LoadedSkin.HeaderFont.Name}""; - font-size: {LoadedSkin.HeaderFont.Size}em; + font-size: {LoadedSkin.HeaderFont.SizeInPoints}pt; }} h2 {{ font-family: ""{LoadedSkin.Header2Font.Name}""; - font-size: {LoadedSkin.Header2Font.Size}em; + font-size: {LoadedSkin.Header2Font.SizeInPoints}pt; }} h3 {{ font-family: ""{LoadedSkin.Header3Font.Name}""; - font-size: {LoadedSkin.Header3Font.Size}em; + font-size: {LoadedSkin.Header3Font.SizeInPoints}pt; }} </style> @@ -84,7 +83,7 @@ namespace ShiftOS.WinForms.Applications private void wbcanvas_Navigating(object sender, WebBrowserNavigatingEventArgs e) { - if (CurrentUrl != e.Url.ToString()) + if (CurrentUrl != e.Url.ToString() && !e.Url.ToString().StartsWith("about:")) { e.Cancel = true; Future.Clear(); |