pull/2530/head
2dust 2022-08-04 17:07:50 +08:00
parent e2053d5a77
commit eaf11c6998
3 changed files with 16 additions and 7 deletions

View File

@ -160,7 +160,15 @@ namespace v2rayN.Forms
if (!config.uiItem.mainLocation.IsEmpty) if (!config.uiItem.mainLocation.IsEmpty)
{ {
Location = config.uiItem.mainLocation; if (config.uiItem.mainLocation.X >= SystemInformation.WorkingArea.Width
|| config.uiItem.mainLocation.Y >= SystemInformation.WorkingArea.Height)
{
Location = new Point(0, 0);
}
else
{
Location = config.uiItem.mainLocation;
}
} }
if (!config.uiItem.mainSize.IsEmpty) if (!config.uiItem.mainSize.IsEmpty)
{ {
@ -289,11 +297,11 @@ namespace v2rayN.Forms
for (int k = 0; k < lstVmess.Count; k++) for (int k = 0; k < lstVmess.Count; k++)
{ {
string def = string.Empty; string def = (k + 1).ToString();
VmessItem item = lstVmess[k]; VmessItem item = lstVmess[k];
if (config.IsActiveNode(item)) if (config.IsActiveNode(item))
{ {
def = "√"; def = Global.CheckMark;
} }
ListViewItem lvItem = new ListViewItem(def); ListViewItem lvItem = new ListViewItem(def);
@ -943,13 +951,13 @@ namespace v2rayN.Forms
{ {
if (config.IsActiveNode(lstVmess[k])) if (config.IsActiveNode(lstVmess[k]))
{ {
lvServers.Items[k].SubItems[0].Text = "√"; lvServers.Items[k].SubItems[0].Text = Global.CheckMark;
lvServers.Items[k].ForeColor = Color.DodgerBlue; lvServers.Items[k].ForeColor = Color.DodgerBlue;
lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Bold); lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Bold);
} }
else else
{ {
lvServers.Items[k].SubItems[0].Text = ""; lvServers.Items[k].SubItems[0].Text = (k + 1).ToString();
lvServers.Items[k].ForeColor = lvServers.ForeColor; lvServers.Items[k].ForeColor = lvServers.ForeColor;
lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Regular); lvServers.Items[k].Font = new Font(lvServers.Font, FontStyle.Regular);
} }

View File

@ -170,7 +170,7 @@ namespace v2rayN.Forms
string def = string.Empty; string def = string.Empty;
if (config.routingIndex.Equals(k)) if (config.routingIndex.Equals(k))
{ {
def = "√"; def = Global.CheckMark;
} }
ListViewItem lvItem = new ListViewItem(def); ListViewItem lvItem = new ListViewItem(def);

View File

@ -217,6 +217,7 @@ namespace v2rayN
public static readonly List<string> domainMatchers = new List<string> { "linear", "mph", "" }; public static readonly List<string> domainMatchers = new List<string> { "linear", "mph", "" };
public const string GrpcgunMode = "gun"; public const string GrpcgunMode = "gun";
public const string GrpcmultiMode = "multi"; public const string GrpcmultiMode = "multi";
public const string CheckMark = "√";
#endregion #endregion