Skip to content

Commit

Permalink
add tray menu and remember window state (closes #34)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pypy-vrc
pypy-vrc committed Mar 21, 2020
1 parent a9d4543 commit d1c84a8
Show file tree
Hide file tree
Showing 5 changed files with 194 additions and 4 deletions.
59 changes: 56 additions & 3 deletions MainForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

114 changes: 113 additions & 1 deletion MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@ public partial class MainForm : Form
{
public static MainForm Instance { get; private set; }
public static ChromiumWebBrowser Browser { get; private set; }
private int LastLocationX;
private int LastLocationY;
private int LastSizeWidth;
private int LastSizeHeight;

public MainForm()
{
Instance = this;
InitializeComponent();
try
{
Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
var location = Assembly.GetExecutingAssembly().Location;
var icon = Icon.ExtractAssociatedIcon(location);
Icon = icon;
TrayIcon.Icon = icon;
}
catch
{
Expand Down Expand Up @@ -52,5 +59,110 @@ public MainForm()
};
Controls.Add(Browser);
}

private void MainForm_Load(object sender, System.EventArgs e)
{
try
{
int.TryParse(VRCXStorage.Instance.Get("VRCX_LocationX"), out LastLocationX);
int.TryParse(VRCXStorage.Instance.Get("VRCX_LocationY"), out LastLocationY);
int.TryParse(VRCXStorage.Instance.Get("VRCX_SizeWidth"), out LastSizeWidth);
int.TryParse(VRCXStorage.Instance.Get("VRCX_SizeHeight"), out LastSizeHeight);
var location = new Point(LastLocationX, LastLocationY);
var size = new Size(LastSizeWidth, LastSizeHeight);
var screen = Screen.FromPoint(location);
if (screen.Bounds.Contains(location.X, location.Y))
{
Location = location;
}
if (size.Width > 0 && size.Height > 0)
{
Size = size;
}
}
catch
{
}
try
{
var state = WindowState;
if (int.TryParse(VRCXStorage.Instance.Get("VRCX_WindowState"), out int v))
{
state = (FormWindowState)v;
}
if (state == FormWindowState.Minimized)
{
state = FormWindowState.Normal;
}
if ("true".Equals(VRCXStorage.Instance.Get("VRCX_StartAsMinimizedState")))
{
state = FormWindowState.Minimized;
}
WindowState = state;
}
catch
{
}
}

private void MainForm_Resize(object sender, System.EventArgs e)
{
if (WindowState != FormWindowState.Normal)
{
return;
}
LastSizeWidth = Size.Width;
LastSizeHeight = Size.Height;
}

private void MainForm_Move(object sender, System.EventArgs e)
{
if (WindowState != FormWindowState.Normal)
{
return;
}
LastLocationX = Location.X;
LastLocationY = Location.Y;
}

private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
{
if (e.CloseReason == CloseReason.UserClosing &&
"true".Equals(VRCXStorage.Instance.Get("VRCX_CloseToTray")))
{
e.Cancel = true;
Hide();
}
}

private void MainForm_FormClosed(object sender, FormClosedEventArgs e)
{
VRCXStorage.Instance.Set("VRCX_LocationX", LastLocationX.ToString());
VRCXStorage.Instance.Set("VRCX_LocationY", LastLocationY.ToString());
VRCXStorage.Instance.Set("VRCX_SizeWidth", LastSizeWidth.ToString());
VRCXStorage.Instance.Set("VRCX_SizeHeight", LastSizeHeight.ToString());
VRCXStorage.Instance.Set("VRCX_WindowState", ((int)WindowState).ToString());
}

private void TrayIcon_MouseDoubleClick(object sender, MouseEventArgs e)
{
TrayMenu_Open_Click(sender, e);
}

private void TrayMenu_Open_Click(object sender, System.EventArgs e)
{
if (WindowState == FormWindowState.Minimized)
{
WindowState = FormWindowState.Normal;
}
Show();
Focus();
}

private void TrayMenu_Quit_Click(object sender, System.EventArgs e)
{
Application.Exit();
}

}
}
6 changes: 6 additions & 0 deletions MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,10 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="TrayMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="TrayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>124, 17</value>
</metadata>
</root>
8 changes: 8 additions & 0 deletions html/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5304,6 +5304,14 @@ CefSharp.BindObjectAsync(
VRCXStorage.SetBool('isDarkMode', this.isDarkMode);
$appDarkStyle.disabled = this.isDarkMode === false;
};
$app.data.isStartAsMinimizedState = VRCXStorage.GetBool('VRCX_StartAsMinimizedState');
$app.data.isCloseToTray = VRCXStorage.GetBool('VRCX_CloseToTray');
var saveVRCXWindowOption = function () {
VRCXStorage.SetBool('VRCX_StartAsMinimizedState', this.isStartAsMinimizedState);
VRCXStorage.SetBool('VRCX_CloseToTray', this.isCloseToTray);
};
$app.watch.isStartAsMinimizedState = saveVRCXWindowOption;
$app.watch.isCloseToTray = saveVRCXWindowOption;

API.$on('LOGIN', function () {
$app.currentUserTreeData = [];
Expand Down
11 changes: 11 additions & 0 deletions html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,17 @@
<el-switch v-model="openVRAlways"></el-switch>
</div>
</div>
<div style="margin-top:30px">
<span style="font-weight:bold">Window</span>
<div style="font-size:12px;margin-top:5px">
<span style="display:inline-block;min-width:150px">Start as Minimized State</span>
<el-switch v-model="isStartAsMinimizedState"></el-switch>
</div>
<div style="font-size:12px;margin-top:5px">
<span style="display:inline-block;min-width:150px">Close to Tray</span>
<el-switch v-model="isCloseToTray"></el-switch>
</div>
</div>
<div style="margin-top:45px;border-top:1px solid #eee;padding-top:30px">
<span style="font-weight:bold">Legal Notice</span>
<div style="margin-top:5px;font-size:12px">
Expand Down

0 comments on commit d1c84a8

Please sign in to comment.