shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shiftnet style fixes

Browse source
This commit is contained in:
Michael 2017-02-02 10:39:48 -05:00
parent bbe37edb68
commit ce47589ce3
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShiftOS.WinForms/Applications/Shiftnet.Designer.cs generated
View file

@ -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";

11
ShiftOS.WinForms/Applications/Shiftnet.cs
View file

@ -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();

4
ShiftOS_TheReturn/AudioManager.cs
View file

@ -31,6 +31,10 @@ namespace ShiftOS.Engine
{
SaveSystem.GameReady += () =>
{
while(_out == null)
{
}
_out.Volume = _provider.Volume;
};
Random rnd = new Random();