From fcc954b7f26c2c7155c35f01b7a835f9bb233435 Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 11 Aug 2019 14:30:18 +0200 Subject: [PATCH] - separated render resolution from video resolution (they don't multiply each other) --- ALVR/Launcher.Designer.cs | 515 +++++++++++++++++----------- ALVR/ServerConfig.cs | 4 + alvr_server/OvrDisplayComponent.cpp | 4 +- alvr_server/Settings.cpp | 3 + alvr_server/Settings.h | 6 + 5 files changed, 323 insertions(+), 209 deletions(-) diff --git a/ALVR/Launcher.Designer.cs b/ALVR/Launcher.Designer.cs index c517762997..dbc4fb3c63 100644 --- a/ALVR/Launcher.Designer.cs +++ b/ALVR/Launcher.Designer.cs @@ -158,36 +158,40 @@ private void InitializeComponent() // // sendClientDebugFlagsButton // - this.sendClientDebugFlagsButton.Location = new System.Drawing.Point(281, 68); + this.sendClientDebugFlagsButton.Location = new System.Drawing.Point(375, 84); + this.sendClientDebugFlagsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.sendClientDebugFlagsButton.Name = "sendClientDebugFlagsButton"; - this.sendClientDebugFlagsButton.Size = new System.Drawing.Size(75, 25); + this.sendClientDebugFlagsButton.Size = new System.Drawing.Size(100, 31); this.sendClientDebugFlagsButton.TabIndex = 6; this.sendClientDebugFlagsButton.Text = "Send"; this.sendClientDebugFlagsButton.Click += new System.EventHandler(this.sendClientDebugFlagsButton_Click); // // sendDriverTestModeButton // - this.sendDriverTestModeButton.Location = new System.Drawing.Point(281, 113); + this.sendDriverTestModeButton.Location = new System.Drawing.Point(375, 139); + this.sendDriverTestModeButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.sendDriverTestModeButton.Name = "sendDriverTestModeButton"; - this.sendDriverTestModeButton.Size = new System.Drawing.Size(75, 25); + this.sendDriverTestModeButton.Size = new System.Drawing.Size(100, 31); this.sendDriverTestModeButton.TabIndex = 6; this.sendDriverTestModeButton.Text = "Send"; this.sendDriverTestModeButton.Click += new System.EventHandler(this.button3_Click); // // metroProgressSpinner1 // - this.metroProgressSpinner1.Location = new System.Drawing.Point(473, 35); + this.metroProgressSpinner1.Location = new System.Drawing.Point(631, 43); + this.metroProgressSpinner1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroProgressSpinner1.Maximum = 100; this.metroProgressSpinner1.Name = "metroProgressSpinner1"; - this.metroProgressSpinner1.Size = new System.Drawing.Size(38, 39); + this.metroProgressSpinner1.Size = new System.Drawing.Size(51, 48); this.metroProgressSpinner1.TabIndex = 7; this.metroProgressSpinner1.Value = 30; // // captureComposedDDSButton // - this.captureComposedDDSButton.Location = new System.Drawing.Point(258, 160); + this.captureComposedDDSButton.Location = new System.Drawing.Point(344, 197); + this.captureComposedDDSButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.captureComposedDDSButton.Name = "captureComposedDDSButton"; - this.captureComposedDDSButton.Size = new System.Drawing.Size(98, 25); + this.captureComposedDDSButton.Size = new System.Drawing.Size(131, 31); this.captureComposedDDSButton.TabIndex = 6; this.captureComposedDDSButton.Text = "Capture Comp."; this.captureComposedDDSButton.Click += new System.EventHandler(this.captureComposedDDSButton_Click); @@ -200,10 +204,11 @@ private void InitializeComponent() this.metroTabControl1.Controls.Add(this.otherTab); this.metroTabControl1.Controls.Add(this.debugTab); this.metroTabControl1.Controls.Add(this.aboutTab); - this.metroTabControl1.Location = new System.Drawing.Point(23, 68); + this.metroTabControl1.Location = new System.Drawing.Point(31, 84); + this.metroTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroTabControl1.Name = "metroTabControl1"; this.metroTabControl1.SelectedIndex = 1; - this.metroTabControl1.Size = new System.Drawing.Size(664, 429); + this.metroTabControl1.Size = new System.Drawing.Size(885, 528); this.metroTabControl1.TabIndex = 8; // // serverTab @@ -212,13 +217,15 @@ private void InitializeComponent() this.serverTab.Controls.Add(this.connectedPanel); this.serverTab.Controls.Add(this.messagePanel); this.serverTab.HorizontalScrollbarBarColor = true; - this.serverTab.HorizontalScrollbarSize = 11; - this.serverTab.Location = new System.Drawing.Point(4, 35); + this.serverTab.HorizontalScrollbarSize = 14; + this.serverTab.Location = new System.Drawing.Point(4, 39); + this.serverTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.serverTab.Name = "serverTab"; - this.serverTab.Size = new System.Drawing.Size(656, 390); + this.serverTab.Size = new System.Drawing.Size(877, 485); this.serverTab.TabIndex = 3; this.serverTab.Text = "Server"; this.serverTab.VerticalScrollbarBarColor = true; + this.serverTab.VerticalScrollbarSize = 13; // // findingPanel // @@ -229,22 +236,24 @@ private void InitializeComponent() this.findingPanel.Controls.Add(this.metroLabel4); this.findingPanel.HorizontalScrollbarBarColor = true; this.findingPanel.HorizontalScrollbarHighlightOnWheel = false; - this.findingPanel.HorizontalScrollbarSize = 11; - this.findingPanel.Location = new System.Drawing.Point(0, 3); + this.findingPanel.HorizontalScrollbarSize = 14; + this.findingPanel.Location = new System.Drawing.Point(0, 4); + this.findingPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.findingPanel.Name = "findingPanel"; - this.findingPanel.Size = new System.Drawing.Size(657, 380); + this.findingPanel.Size = new System.Drawing.Size(876, 468); this.findingPanel.TabIndex = 11; this.findingPanel.VerticalScrollbarBarColor = true; this.findingPanel.VerticalScrollbarHighlightOnWheel = false; - this.findingPanel.VerticalScrollbarSize = 10; + this.findingPanel.VerticalScrollbarSize = 13; this.findingPanel.Visible = false; // // noClientLabel // this.noClientLabel.AutoSize = true; - this.noClientLabel.Location = new System.Drawing.Point(79, 114); + this.noClientLabel.Location = new System.Drawing.Point(105, 140); + this.noClientLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.noClientLabel.Name = "noClientLabel"; - this.noClientLabel.Size = new System.Drawing.Size(292, 76); + this.noClientLabel.Size = new System.Drawing.Size(312, 80); this.noClientLabel.TabIndex = 10; this.noClientLabel.Text = "Headset not found.\r\n\r\nMake sure the client is launched.\r\nOr check the firewall se" + "ttings (permit UDP/9944)."; @@ -280,7 +289,8 @@ private void InitializeComponent() dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; - this.dataGridView1.Location = new System.Drawing.Point(29, 30); + this.dataGridView1.Location = new System.Drawing.Point(39, 37); + this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -299,7 +309,7 @@ private void InitializeComponent() this.dataGridView1.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.dataGridView1.RowTemplate.Height = 40; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(392, 327); + this.dataGridView1.Size = new System.Drawing.Size(523, 402); this.dataGridView1.TabIndex = 2; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); // @@ -332,10 +342,11 @@ private void InitializeComponent() // // metroProgressSpinner2 // - this.metroProgressSpinner2.Location = new System.Drawing.Point(443, 172); + this.metroProgressSpinner2.Location = new System.Drawing.Point(591, 212); + this.metroProgressSpinner2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroProgressSpinner2.Maximum = 100; this.metroProgressSpinner2.Name = "metroProgressSpinner2"; - this.metroProgressSpinner2.Size = new System.Drawing.Size(38, 39); + this.metroProgressSpinner2.Size = new System.Drawing.Size(51, 48); this.metroProgressSpinner2.TabIndex = 7; this.metroProgressSpinner2.Value = 70; // @@ -346,9 +357,10 @@ private void InitializeComponent() this.wrongVersionLabel.CustomForeColor = true; this.wrongVersionLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular; this.wrongVersionLabel.ForeColor = System.Drawing.Color.Crimson; - this.wrongVersionLabel.Location = new System.Drawing.Point(446, 243); + this.wrongVersionLabel.Location = new System.Drawing.Point(595, 299); + this.wrongVersionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.wrongVersionLabel.Name = "wrongVersionLabel"; - this.wrongVersionLabel.Size = new System.Drawing.Size(207, 47); + this.wrongVersionLabel.Size = new System.Drawing.Size(276, 58); this.wrongVersionLabel.TabIndex = 9; this.wrongVersionLabel.Text = "Found wrong version client.\r\nCheck for client/server update."; this.wrongVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -360,9 +372,10 @@ private void InitializeComponent() this.metroLabel4.CustomBackground = true; this.metroLabel4.CustomForeColor = true; this.metroLabel4.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.metroLabel4.Location = new System.Drawing.Point(487, 172); + this.metroLabel4.Location = new System.Drawing.Point(649, 212); + this.metroLabel4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel4.Name = "metroLabel4"; - this.metroLabel4.Size = new System.Drawing.Size(156, 42); + this.metroLabel4.Size = new System.Drawing.Size(208, 52); this.metroLabel4.TabIndex = 9; this.metroLabel4.Text = "Finding Headset..."; this.metroLabel4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -375,21 +388,23 @@ private void InitializeComponent() this.connectedPanel.Controls.Add(this.connectedLabel); this.connectedPanel.HorizontalScrollbarBarColor = true; this.connectedPanel.HorizontalScrollbarHighlightOnWheel = false; - this.connectedPanel.HorizontalScrollbarSize = 11; - this.connectedPanel.Location = new System.Drawing.Point(3, 3); + this.connectedPanel.HorizontalScrollbarSize = 14; + this.connectedPanel.Location = new System.Drawing.Point(4, 4); + this.connectedPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.connectedPanel.Name = "connectedPanel"; - this.connectedPanel.Size = new System.Drawing.Size(657, 380); + this.connectedPanel.Size = new System.Drawing.Size(876, 468); this.connectedPanel.TabIndex = 11; this.connectedPanel.VerticalScrollbarBarColor = true; this.connectedPanel.VerticalScrollbarHighlightOnWheel = false; - this.connectedPanel.VerticalScrollbarSize = 10; + this.connectedPanel.VerticalScrollbarSize = 13; // // autoConnectCheckBox // this.autoConnectCheckBox.AutoSize = true; - this.autoConnectCheckBox.Location = new System.Drawing.Point(73, 221); + this.autoConnectCheckBox.Location = new System.Drawing.Point(97, 272); + this.autoConnectCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.autoConnectCheckBox.Name = "autoConnectCheckBox"; - this.autoConnectCheckBox.Size = new System.Drawing.Size(148, 15); + this.autoConnectCheckBox.Size = new System.Drawing.Size(157, 17); this.autoConnectCheckBox.TabIndex = 13; this.autoConnectCheckBox.Text = "Auto connect next time"; this.autoConnectCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -423,7 +438,8 @@ private void InitializeComponent() dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.statDataGridView.DefaultCellStyle = dataGridViewCellStyle6; - this.statDataGridView.Location = new System.Drawing.Point(282, 30); + this.statDataGridView.Location = new System.Drawing.Point(376, 37); + this.statDataGridView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.statDataGridView.Name = "statDataGridView"; this.statDataGridView.ReadOnly = true; dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -439,7 +455,7 @@ private void InitializeComponent() this.statDataGridView.RowTemplate.DefaultCellStyle.SelectionForeColor = System.Drawing.Color.Black; this.statDataGridView.RowTemplate.Height = 21; this.statDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.statDataGridView.Size = new System.Drawing.Size(352, 324); + this.statDataGridView.Size = new System.Drawing.Size(469, 399); this.statDataGridView.TabIndex = 12; // // Name1 @@ -458,9 +474,10 @@ private void InitializeComponent() // // closeServerButton // - this.closeServerButton.Location = new System.Drawing.Point(91, 261); + this.closeServerButton.Location = new System.Drawing.Point(121, 321); + this.closeServerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.closeServerButton.Name = "closeServerButton"; - this.closeServerButton.Size = new System.Drawing.Size(113, 43); + this.closeServerButton.Size = new System.Drawing.Size(151, 53); this.closeServerButton.TabIndex = 11; this.closeServerButton.Text = "Close server"; this.closeServerButton.Click += new System.EventHandler(this.disconnectButton_Click); @@ -471,9 +488,10 @@ private void InitializeComponent() this.connectedLabel.CustomBackground = true; this.connectedLabel.CustomForeColor = true; this.connectedLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.connectedLabel.Location = new System.Drawing.Point(64, 73); + this.connectedLabel.Location = new System.Drawing.Point(85, 90); + this.connectedLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.connectedLabel.Name = "connectedLabel"; - this.connectedLabel.Size = new System.Drawing.Size(156, 100); + this.connectedLabel.Size = new System.Drawing.Size(208, 123); this.connectedLabel.TabIndex = 9; this.connectedLabel.Text = "Client connected.\r\nDevice Name\r\nIP Address:port\r\n"; this.connectedLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -483,14 +501,15 @@ private void InitializeComponent() this.messagePanel.Controls.Add(this.messageLabel); this.messagePanel.HorizontalScrollbarBarColor = true; this.messagePanel.HorizontalScrollbarHighlightOnWheel = false; - this.messagePanel.HorizontalScrollbarSize = 11; - this.messagePanel.Location = new System.Drawing.Point(3, 3); + this.messagePanel.HorizontalScrollbarSize = 14; + this.messagePanel.Location = new System.Drawing.Point(4, 4); + this.messagePanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.messagePanel.Name = "messagePanel"; - this.messagePanel.Size = new System.Drawing.Size(657, 380); + this.messagePanel.Size = new System.Drawing.Size(876, 468); this.messagePanel.TabIndex = 10; this.messagePanel.VerticalScrollbarBarColor = true; this.messagePanel.VerticalScrollbarHighlightOnWheel = false; - this.messagePanel.VerticalScrollbarSize = 10; + this.messagePanel.VerticalScrollbarSize = 13; // // messageLabel // @@ -498,9 +517,10 @@ private void InitializeComponent() this.messageLabel.CustomBackground = true; this.messageLabel.CustomForeColor = true; this.messageLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.messageLabel.Location = new System.Drawing.Point(161, 101); + this.messageLabel.Location = new System.Drawing.Point(215, 124); + this.messageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.messageLabel.Name = "messageLabel"; - this.messageLabel.Size = new System.Drawing.Size(335, 81); + this.messageLabel.Size = new System.Drawing.Size(447, 100); this.messageLabel.TabIndex = 9; this.messageLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -528,53 +548,60 @@ private void InitializeComponent() this.videoTab.Controls.Add(this.bufferTrackBar); this.videoTab.Controls.Add(this.bitrateTrackBar); this.videoTab.HorizontalScrollbarBarColor = true; - this.videoTab.HorizontalScrollbarSize = 11; - this.videoTab.Location = new System.Drawing.Point(4, 35); + this.videoTab.HorizontalScrollbarSize = 14; + this.videoTab.Location = new System.Drawing.Point(4, 39); + this.videoTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.videoTab.Name = "videoTab"; - this.videoTab.Size = new System.Drawing.Size(656, 390); + this.videoTab.Size = new System.Drawing.Size(877, 485); this.videoTab.TabIndex = 5; this.videoTab.Text = "Video"; this.videoTab.VerticalScrollbarBarColor = true; + this.videoTab.VerticalScrollbarSize = 13; // // label3 // this.label3.BackColor = System.Drawing.Color.DarkGray; - this.label3.Location = new System.Drawing.Point(29, 64); + this.label3.Location = new System.Drawing.Point(39, 79); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(600, 1); + this.label3.Size = new System.Drawing.Size(800, 1); this.label3.TabIndex = 9; // // label2 // this.label2.BackColor = System.Drawing.Color.DarkGray; - this.label2.Location = new System.Drawing.Point(29, 254); + this.label2.Location = new System.Drawing.Point(39, 313); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(600, 1); + this.label2.Size = new System.Drawing.Size(800, 1); this.label2.TabIndex = 9; // // label1 // this.label1.BackColor = System.Drawing.Color.DarkGray; - this.label1.Location = new System.Drawing.Point(29, 161); + this.label1.Location = new System.Drawing.Point(39, 198); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(600, 1); + this.label1.Size = new System.Drawing.Size(800, 1); this.label1.TabIndex = 8; // // metroLabel13 // this.metroLabel13.AutoSize = true; - this.metroLabel13.Location = new System.Drawing.Point(171, 339); + this.metroLabel13.Location = new System.Drawing.Point(228, 417); + this.metroLabel13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel13.Name = "metroLabel13"; - this.metroLabel13.Size = new System.Drawing.Size(292, 19); + this.metroLabel13.Size = new System.Drawing.Size(311, 20); this.metroLabel13.TabIndex = 7; this.metroLabel13.Text = "These settings will be applied after restart server."; // // metroLabel19 // this.metroLabel19.AutoSize = true; - this.metroLabel19.Location = new System.Drawing.Point(56, 308); + this.metroLabel19.Location = new System.Drawing.Point(75, 379); + this.metroLabel19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel19.Name = "metroLabel19"; - this.metroLabel19.Size = new System.Drawing.Size(558, 19); + this.metroLabel19.Size = new System.Drawing.Size(597, 20); this.metroLabel19.TabIndex = 7; this.metroLabel19.Text = "Buffer size on client side. 200kB is recommended. If you experience packet loss, " + "enlarge buffer."; @@ -582,19 +609,21 @@ private void InitializeComponent() // metroLabel11 // this.metroLabel11.AutoSize = true; - this.metroLabel11.Location = new System.Drawing.Point(56, 128); + this.metroLabel11.Location = new System.Drawing.Point(75, 158); + this.metroLabel11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel11.Name = "metroLabel11"; - this.metroLabel11.Size = new System.Drawing.Size(321, 19); + this.metroLabel11.Size = new System.Drawing.Size(336, 20); this.metroLabel11.TabIndex = 7; this.metroLabel11.Text = "Bitrate of video streaming. 30Mbps is recommended."; // // codecComboBox // this.codecComboBox.FormattingEnabled = true; - this.codecComboBox.ItemHeight = 23; - this.codecComboBox.Location = new System.Drawing.Point(185, 14); + this.codecComboBox.ItemHeight = 24; + this.codecComboBox.Location = new System.Drawing.Point(247, 17); + this.codecComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.codecComboBox.Name = "codecComboBox"; - this.codecComboBox.Size = new System.Drawing.Size(192, 29); + this.codecComboBox.Size = new System.Drawing.Size(255, 30); this.codecComboBox.TabIndex = 6; // // resolutionComboBox @@ -602,19 +631,20 @@ private void InitializeComponent() this.resolutionComboBox.DisplayMember = "width"; this.resolutionComboBox.FontSize = MetroFramework.MetroLinkSize.Small; this.resolutionComboBox.FormattingEnabled = true; - this.resolutionComboBox.ItemHeight = 19; + this.resolutionComboBox.ItemHeight = 21; this.resolutionComboBox.Items.AddRange(new object[] { "25%", "50%", "75%", - "100%", + "100%", "125%", "150%", "175%", "200%"}); - this.resolutionComboBox.Location = new System.Drawing.Point(185, 177); + this.resolutionComboBox.Location = new System.Drawing.Point(247, 218); + this.resolutionComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.resolutionComboBox.Name = "resolutionComboBox"; - this.resolutionComboBox.Size = new System.Drawing.Size(240, 25); + this.resolutionComboBox.Size = new System.Drawing.Size(319, 27); this.resolutionComboBox.TabIndex = 6; this.resolutionComboBox.ValueMember = "width"; this.resolutionComboBox.SelectedIndexChanged += new System.EventHandler(this.resolutionComboBox_SelectedIndexChanged); @@ -623,9 +653,10 @@ private void InitializeComponent() // this.bufferLabel.AutoSize = true; this.bufferLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - this.bufferLabel.Location = new System.Drawing.Point(559, 280); + this.bufferLabel.Location = new System.Drawing.Point(745, 345); + this.bufferLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.bufferLabel.Name = "bufferLabel"; - this.bufferLabel.Size = new System.Drawing.Size(57, 25); + this.bufferLabel.Size = new System.Drawing.Size(60, 25); this.bufferLabel.TabIndex = 5; this.bufferLabel.Text = "200kB"; // @@ -633,45 +664,50 @@ private void InitializeComponent() // this.bitrateLabel.AutoSize = true; this.bitrateLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - this.bitrateLabel.Location = new System.Drawing.Point(559, 93); + this.bitrateLabel.Location = new System.Drawing.Point(745, 114); + this.bitrateLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.bitrateLabel.Name = "bitrateLabel"; - this.bitrateLabel.Size = new System.Drawing.Size(72, 25); + this.bitrateLabel.Size = new System.Drawing.Size(77, 25); this.bitrateLabel.TabIndex = 5; this.bitrateLabel.Text = "30Mbps"; // // metroLabel18 // this.metroLabel18.AutoSize = true; - this.metroLabel18.Location = new System.Drawing.Point(533, 252); + this.metroLabel18.Location = new System.Drawing.Point(711, 310); + this.metroLabel18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel18.Name = "metroLabel18"; - this.metroLabel18.Size = new System.Drawing.Size(51, 19); + this.metroLabel18.Size = new System.Drawing.Size(56, 20); this.metroLabel18.TabIndex = 4; this.metroLabel18.Text = "2000kB"; // // metroLabel9 // this.metroLabel9.AutoSize = true; - this.metroLabel9.Location = new System.Drawing.Point(523, 76); + this.metroLabel9.Location = new System.Drawing.Point(697, 94); + this.metroLabel9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel9.Name = "metroLabel9"; - this.metroLabel9.Size = new System.Drawing.Size(63, 19); + this.metroLabel9.Size = new System.Drawing.Size(67, 20); this.metroLabel9.TabIndex = 4; this.metroLabel9.Text = "250Mbps"; // // metroLabel17 // this.metroLabel17.AutoSize = true; - this.metroLabel17.Location = new System.Drawing.Point(161, 256); + this.metroLabel17.Location = new System.Drawing.Point(215, 315); + this.metroLabel17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel17.Name = "metroLabel17"; - this.metroLabel17.Size = new System.Drawing.Size(42, 19); + this.metroLabel17.Size = new System.Drawing.Size(45, 20); this.metroLabel17.TabIndex = 4; this.metroLabel17.Text = "100kB"; // // metroLabel8 // this.metroLabel8.AutoSize = true; - this.metroLabel8.Location = new System.Drawing.Point(161, 76); + this.metroLabel8.Location = new System.Drawing.Point(215, 94); + this.metroLabel8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel8.Name = "metroLabel8"; - this.metroLabel8.Size = new System.Drawing.Size(47, 19); + this.metroLabel8.Size = new System.Drawing.Size(48, 20); this.metroLabel8.TabIndex = 4; this.metroLabel8.Text = "1Mbps"; // @@ -679,9 +715,10 @@ private void InitializeComponent() // this.metroLabel16.AutoSize = true; this.metroLabel16.FontSize = MetroFramework.MetroLabelSize.Tall; - this.metroLabel16.Location = new System.Drawing.Point(25, 260); + this.metroLabel16.Location = new System.Drawing.Point(33, 320); + this.metroLabel16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel16.Name = "metroLabel16"; - this.metroLabel16.Size = new System.Drawing.Size(90, 25); + this.metroLabel16.Size = new System.Drawing.Size(93, 25); this.metroLabel16.TabIndex = 3; this.metroLabel16.Text = "Buffer size"; // @@ -689,9 +726,10 @@ private void InitializeComponent() // this.resolutionLabel.AutoSize = true; this.resolutionLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - this.resolutionLabel.Location = new System.Drawing.Point(446, 177); + this.resolutionLabel.Location = new System.Drawing.Point(595, 218); + this.resolutionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.resolutionLabel.Name = "resolutionLabel"; - this.resolutionLabel.Size = new System.Drawing.Size(91, 25); + this.resolutionLabel.Size = new System.Drawing.Size(97, 25); this.resolutionLabel.TabIndex = 3; this.resolutionLabel.Text = "2048x1024"; // @@ -699,19 +737,21 @@ private void InitializeComponent() // this.metroLabel10.AutoSize = true; this.metroLabel10.FontSize = MetroFramework.MetroLabelSize.Tall; - this.metroLabel10.Location = new System.Drawing.Point(25, 177); + this.metroLabel10.Location = new System.Drawing.Point(33, 218); + this.metroLabel10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel10.Name = "metroLabel10"; - this.metroLabel10.Size = new System.Drawing.Size(91, 25); + this.metroLabel10.Size = new System.Drawing.Size(143, 25); this.metroLabel10.TabIndex = 3; - this.metroLabel10.Text = "Resolution"; + this.metroLabel10.Text = "Video resolution"; // // metroLabel31 // this.metroLabel31.AutoSize = true; this.metroLabel31.FontSize = MetroFramework.MetroLabelSize.Tall; - this.metroLabel31.Location = new System.Drawing.Point(25, 18); + this.metroLabel31.Location = new System.Drawing.Point(33, 22); + this.metroLabel31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel31.Name = "metroLabel31"; - this.metroLabel31.Size = new System.Drawing.Size(60, 25); + this.metroLabel31.Size = new System.Drawing.Size(64, 25); this.metroLabel31.TabIndex = 3; this.metroLabel31.Text = "Codec"; // @@ -719,9 +759,10 @@ private void InitializeComponent() // this.metroLabel7.AutoSize = true; this.metroLabel7.FontSize = MetroFramework.MetroLabelSize.Tall; - this.metroLabel7.Location = new System.Drawing.Point(25, 93); + this.metroLabel7.Location = new System.Drawing.Point(33, 114); + this.metroLabel7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel7.Name = "metroLabel7"; - this.metroLabel7.Size = new System.Drawing.Size(60, 25); + this.metroLabel7.Size = new System.Drawing.Size(63, 25); this.metroLabel7.TabIndex = 3; this.metroLabel7.Text = "Bitrate"; // @@ -729,9 +770,10 @@ private void InitializeComponent() // this.bufferTrackBar.BackColor = System.Drawing.Color.Transparent; this.bufferTrackBar.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::ALVR.Properties.Settings.Default, "bufferSize", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.bufferTrackBar.Location = new System.Drawing.Point(185, 280); + this.bufferTrackBar.Location = new System.Drawing.Point(247, 345); + this.bufferTrackBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bufferTrackBar.Name = "bufferTrackBar"; - this.bufferTrackBar.Size = new System.Drawing.Size(368, 25); + this.bufferTrackBar.Size = new System.Drawing.Size(491, 31); this.bufferTrackBar.TabIndex = 2; this.bufferTrackBar.Text = "metroTrackBar1"; this.bufferTrackBar.Value = global::ALVR.Properties.Settings.Default.bufferSize; @@ -741,11 +783,12 @@ private void InitializeComponent() // this.bitrateTrackBar.BackColor = System.Drawing.Color.Transparent; this.bitrateTrackBar.DataBindings.Add(new System.Windows.Forms.Binding("Value", global::ALVR.Properties.Settings.Default, "bitrate", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.bitrateTrackBar.Location = new System.Drawing.Point(185, 100); + this.bitrateTrackBar.Location = new System.Drawing.Point(247, 123); + this.bitrateTrackBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.bitrateTrackBar.Maximum = 250; this.bitrateTrackBar.Minimum = 1; this.bitrateTrackBar.Name = "bitrateTrackBar"; - this.bitrateTrackBar.Size = new System.Drawing.Size(368, 25); + this.bitrateTrackBar.Size = new System.Drawing.Size(491, 31); this.bitrateTrackBar.TabIndex = 2; this.bitrateTrackBar.Text = "metroTrackBar1"; this.bitrateTrackBar.Value = global::ALVR.Properties.Settings.Default.bitrate; @@ -758,20 +801,23 @@ private void InitializeComponent() this.soundTab.Controls.Add(this.defaultSoundDeviceCheckBox); this.soundTab.Controls.Add(this.soundCheckBox); this.soundTab.HorizontalScrollbarBarColor = true; - this.soundTab.HorizontalScrollbarSize = 11; - this.soundTab.Location = new System.Drawing.Point(4, 35); + this.soundTab.HorizontalScrollbarSize = 14; + this.soundTab.Location = new System.Drawing.Point(4, 39); + this.soundTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.soundTab.Name = "soundTab"; - this.soundTab.Size = new System.Drawing.Size(656, 390); + this.soundTab.Size = new System.Drawing.Size(877, 485); this.soundTab.TabIndex = 8; this.soundTab.Text = "Sound"; this.soundTab.VerticalScrollbarBarColor = true; + this.soundTab.VerticalScrollbarSize = 13; // // noSoundDeviceLabel // this.noSoundDeviceLabel.AutoSize = true; - this.noSoundDeviceLabel.Location = new System.Drawing.Point(30, 38); + this.noSoundDeviceLabel.Location = new System.Drawing.Point(40, 47); + this.noSoundDeviceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.noSoundDeviceLabel.Name = "noSoundDeviceLabel"; - this.noSoundDeviceLabel.Size = new System.Drawing.Size(176, 19); + this.noSoundDeviceLabel.Size = new System.Drawing.Size(188, 20); this.noSoundDeviceLabel.TabIndex = 4; this.noSoundDeviceLabel.Text = "No sound devices are found."; this.noSoundDeviceLabel.Visible = false; @@ -780,9 +826,10 @@ private void InitializeComponent() // this.soundDeviceComboBox.FormattingEnabled = true; this.soundDeviceComboBox.ItemHeight = 23; - this.soundDeviceComboBox.Location = new System.Drawing.Point(76, 126); + this.soundDeviceComboBox.Location = new System.Drawing.Point(101, 155); + this.soundDeviceComboBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.soundDeviceComboBox.Name = "soundDeviceComboBox"; - this.soundDeviceComboBox.Size = new System.Drawing.Size(471, 29); + this.soundDeviceComboBox.Size = new System.Drawing.Size(627, 29); this.soundDeviceComboBox.TabIndex = 3; // // defaultSoundDeviceCheckBox @@ -791,9 +838,10 @@ private void InitializeComponent() this.defaultSoundDeviceCheckBox.Checked = global::ALVR.Properties.Settings.Default.useDefaultSoundDevice; this.defaultSoundDeviceCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; this.defaultSoundDeviceCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "useDefaultSoundDevice", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.defaultSoundDeviceCheckBox.Location = new System.Drawing.Point(53, 83); + this.defaultSoundDeviceCheckBox.Location = new System.Drawing.Point(71, 102); + this.defaultSoundDeviceCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.defaultSoundDeviceCheckBox.Name = "defaultSoundDeviceCheckBox"; - this.defaultSoundDeviceCheckBox.Size = new System.Drawing.Size(119, 15); + this.defaultSoundDeviceCheckBox.Size = new System.Drawing.Size(131, 17); this.defaultSoundDeviceCheckBox.TabIndex = 2; this.defaultSoundDeviceCheckBox.Text = "Use default device"; this.defaultSoundDeviceCheckBox.UseVisualStyleBackColor = true; @@ -805,9 +853,10 @@ private void InitializeComponent() this.soundCheckBox.Checked = global::ALVR.Properties.Settings.Default.enableSound; this.soundCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; this.soundCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "enableSound", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.soundCheckBox.Location = new System.Drawing.Point(30, 38); + this.soundCheckBox.Location = new System.Drawing.Point(40, 47); + this.soundCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.soundCheckBox.Name = "soundCheckBox"; - this.soundCheckBox.Size = new System.Drawing.Size(92, 15); + this.soundCheckBox.Size = new System.Drawing.Size(100, 17); this.soundCheckBox.TabIndex = 2; this.soundCheckBox.Text = "Steam sound"; this.soundCheckBox.UseVisualStyleBackColor = true; @@ -834,20 +883,23 @@ private void InitializeComponent() this.otherTab.Controls.Add(this.suppressFrameDropCheckBox); this.otherTab.Controls.Add(this.onlySteamVRCheckBox); this.otherTab.HorizontalScrollbarBarColor = true; - this.otherTab.HorizontalScrollbarSize = 11; - this.otherTab.Location = new System.Drawing.Point(4, 35); + this.otherTab.HorizontalScrollbarSize = 14; + this.otherTab.Location = new System.Drawing.Point(4, 39); + this.otherTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.otherTab.Name = "otherTab"; - this.otherTab.Size = new System.Drawing.Size(656, 390); + this.otherTab.Size = new System.Drawing.Size(877, 485); this.otherTab.TabIndex = 7; this.otherTab.Text = "Other"; this.otherTab.VerticalScrollbar = true; this.otherTab.VerticalScrollbarBarColor = true; + this.otherTab.VerticalScrollbarSize = 13; // // metroButton1 // - this.metroButton1.Location = new System.Drawing.Point(245, 22); + this.metroButton1.Location = new System.Drawing.Point(327, 27); + this.metroButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroButton1.Name = "metroButton1"; - this.metroButton1.Size = new System.Drawing.Size(75, 25); + this.metroButton1.Size = new System.Drawing.Size(100, 31); this.metroButton1.TabIndex = 22; this.metroButton1.Text = "Save"; this.metroButton1.Click += new System.EventHandler(this.metroButton1_Click); @@ -855,9 +907,10 @@ private void InitializeComponent() // controllerPoseOffset // this.controllerPoseOffset.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "controllerPoseOffset", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.controllerPoseOffset.Location = new System.Drawing.Point(187, 27); + this.controllerPoseOffset.Location = new System.Drawing.Point(249, 33); + this.controllerPoseOffset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.controllerPoseOffset.Name = "controllerPoseOffset"; - this.controllerPoseOffset.Size = new System.Drawing.Size(52, 19); + this.controllerPoseOffset.Size = new System.Drawing.Size(69, 23); this.controllerPoseOffset.TabIndex = 21; this.controllerPoseOffset.Text = global::ALVR.Properties.Settings.Default.controllerPoseOffset; this.controllerPoseOffset.Click += new System.EventHandler(this.controllerPoseOffset_Click); @@ -865,27 +918,30 @@ private void InitializeComponent() // metroLabel12 // this.metroLabel12.AutoSize = true; - this.metroLabel12.Location = new System.Drawing.Point(26, 28); + this.metroLabel12.Location = new System.Drawing.Point(35, 34); + this.metroLabel12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel12.Name = "metroLabel12"; - this.metroLabel12.Size = new System.Drawing.Size(138, 19); + this.metroLabel12.Size = new System.Drawing.Size(144, 20); this.metroLabel12.TabIndex = 20; this.metroLabel12.Text = "Controller Pose Offset"; // // trackingFrameOffsetTextBox // this.trackingFrameOffsetTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "trackingFrameOffset", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.trackingFrameOffsetTextBox.Location = new System.Drawing.Point(193, 268); + this.trackingFrameOffsetTextBox.Location = new System.Drawing.Point(257, 330); + this.trackingFrameOffsetTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trackingFrameOffsetTextBox.Name = "trackingFrameOffsetTextBox"; - this.trackingFrameOffsetTextBox.Size = new System.Drawing.Size(86, 25); + this.trackingFrameOffsetTextBox.Size = new System.Drawing.Size(115, 31); this.trackingFrameOffsetTextBox.TabIndex = 19; this.trackingFrameOffsetTextBox.Text = global::ALVR.Properties.Settings.Default.trackingFrameOffset; // // metroLabel30 // this.metroLabel30.AutoSize = true; - this.metroLabel30.Location = new System.Drawing.Point(67, 306); + this.metroLabel30.Location = new System.Drawing.Point(89, 377); + this.metroLabel30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel30.Name = "metroLabel30"; - this.metroLabel30.Size = new System.Drawing.Size(279, 38); + this.metroLabel30.Size = new System.Drawing.Size(298, 40); this.metroLabel30.TabIndex = 18; this.metroLabel30.Text = "Try \"-1\" if you exceprience jerky head-tracking.\r\nPut \"0\" on if you have no probl" + "em."; @@ -893,44 +949,49 @@ private void InitializeComponent() // metroLabel29 // this.metroLabel29.AutoSize = true; - this.metroLabel29.Location = new System.Drawing.Point(38, 273); + this.metroLabel29.Location = new System.Drawing.Point(51, 336); + this.metroLabel29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel29.Name = "metroLabel29"; - this.metroLabel29.Size = new System.Drawing.Size(129, 19); + this.metroLabel29.Size = new System.Drawing.Size(136, 20); this.metroLabel29.TabIndex = 18; this.metroLabel29.Text = "TrackingFrameOffset"; // // metroLabel28 // this.metroLabel28.AutoSize = true; - this.metroLabel28.Location = new System.Drawing.Point(38, 220); + this.metroLabel28.Location = new System.Drawing.Point(51, 271); + this.metroLabel28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel28.Name = "metroLabel28"; - this.metroLabel28.Size = new System.Drawing.Size(92, 19); + this.metroLabel28.Size = new System.Drawing.Size(99, 20); this.metroLabel28.TabIndex = 17; this.metroLabel28.Text = "On disconnect"; // // metroLabel27 // this.metroLabel27.AutoSize = true; - this.metroLabel27.Location = new System.Drawing.Point(54, 189); + this.metroLabel27.Location = new System.Drawing.Point(72, 233); + this.metroLabel27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel27.Name = "metroLabel27"; - this.metroLabel27.Size = new System.Drawing.Size(76, 19); + this.metroLabel27.Size = new System.Drawing.Size(82, 20); this.metroLabel27.TabIndex = 17; this.metroLabel27.Text = "On connect"; // // refDisconnectCommandButton // - this.refDisconnectCommandButton.Location = new System.Drawing.Point(526, 220); + this.refDisconnectCommandButton.Location = new System.Drawing.Point(701, 271); + this.refDisconnectCommandButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.refDisconnectCommandButton.Name = "refDisconnectCommandButton"; - this.refDisconnectCommandButton.Size = new System.Drawing.Size(52, 25); + this.refDisconnectCommandButton.Size = new System.Drawing.Size(69, 31); this.refDisconnectCommandButton.TabIndex = 16; this.refDisconnectCommandButton.Text = "..."; this.refDisconnectCommandButton.Click += new System.EventHandler(this.refDisconnectCommandButton_Click); // // refConnectCommandButton // - this.refConnectCommandButton.Location = new System.Drawing.Point(526, 189); + this.refConnectCommandButton.Location = new System.Drawing.Point(701, 233); + this.refConnectCommandButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.refConnectCommandButton.Name = "refConnectCommandButton"; - this.refConnectCommandButton.Size = new System.Drawing.Size(52, 25); + this.refConnectCommandButton.Size = new System.Drawing.Size(69, 31); this.refConnectCommandButton.TabIndex = 16; this.refConnectCommandButton.Text = "..."; this.refConnectCommandButton.Click += new System.EventHandler(this.refConnectCommandButton_Click); @@ -938,26 +999,29 @@ private void InitializeComponent() // disconnectCommandTextBox // this.disconnectCommandTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "disconnectCommand", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.disconnectCommandTextBox.Location = new System.Drawing.Point(136, 220); + this.disconnectCommandTextBox.Location = new System.Drawing.Point(181, 271); + this.disconnectCommandTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.disconnectCommandTextBox.Name = "disconnectCommandTextBox"; - this.disconnectCommandTextBox.Size = new System.Drawing.Size(383, 25); + this.disconnectCommandTextBox.Size = new System.Drawing.Size(511, 31); this.disconnectCommandTextBox.TabIndex = 15; this.disconnectCommandTextBox.Text = global::ALVR.Properties.Settings.Default.disconnectCommand; // // connectCommandTextBox // this.connectCommandTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::ALVR.Properties.Settings.Default, "connectCommand", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.connectCommandTextBox.Location = new System.Drawing.Point(136, 189); + this.connectCommandTextBox.Location = new System.Drawing.Point(181, 233); + this.connectCommandTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.connectCommandTextBox.Name = "connectCommandTextBox"; - this.connectCommandTextBox.Size = new System.Drawing.Size(383, 25); + this.connectCommandTextBox.Size = new System.Drawing.Size(511, 31); this.connectCommandTextBox.TabIndex = 15; this.connectCommandTextBox.Text = global::ALVR.Properties.Settings.Default.connectCommand; // // saveTrackingFrameOffsetButton // - this.saveTrackingFrameOffsetButton.Location = new System.Drawing.Point(287, 268); + this.saveTrackingFrameOffsetButton.Location = new System.Drawing.Point(383, 330); + this.saveTrackingFrameOffsetButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.saveTrackingFrameOffsetButton.Name = "saveTrackingFrameOffsetButton"; - this.saveTrackingFrameOffsetButton.Size = new System.Drawing.Size(75, 25); + this.saveTrackingFrameOffsetButton.Size = new System.Drawing.Size(100, 31); this.saveTrackingFrameOffsetButton.TabIndex = 10; this.saveTrackingFrameOffsetButton.Text = "Save"; this.saveTrackingFrameOffsetButton.Click += new System.EventHandler(this.saveTrackingFrameOffsetButton_Click); @@ -965,9 +1029,10 @@ private void InitializeComponent() // metroLabel26 // this.metroLabel26.AutoSize = true; - this.metroLabel26.Location = new System.Drawing.Point(34, 159); + this.metroLabel26.Location = new System.Drawing.Point(45, 196); + this.metroLabel26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel26.Name = "metroLabel26"; - this.metroLabel26.Size = new System.Drawing.Size(95, 19); + this.metroLabel26.Size = new System.Drawing.Size(99, 20); this.metroLabel26.TabIndex = 3; this.metroLabel26.Text = "Run command"; // @@ -976,9 +1041,10 @@ private void InitializeComponent() this.disableThrottlingCheckBox.AutoSize = true; this.disableThrottlingCheckBox.Checked = global::ALVR.Properties.Settings.Default.disableThrottling; this.disableThrottlingCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "disableThrottling", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.disableThrottlingCheckBox.Location = new System.Drawing.Point(407, 150); + this.disableThrottlingCheckBox.Location = new System.Drawing.Point(543, 185); + this.disableThrottlingCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.disableThrottlingCheckBox.Name = "disableThrottlingCheckBox"; - this.disableThrottlingCheckBox.Size = new System.Drawing.Size(142, 15); + this.disableThrottlingCheckBox.Size = new System.Drawing.Size(156, 17); this.disableThrottlingCheckBox.TabIndex = 2; this.disableThrottlingCheckBox.Text = "Disable send throttling"; this.disableThrottlingCheckBox.UseVisualStyleBackColor = true; @@ -989,9 +1055,10 @@ private void InitializeComponent() this.force60HzCheckBox.AutoSize = true; this.force60HzCheckBox.Checked = global::ALVR.Properties.Settings.Default.force60Hz; this.force60HzCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "force60Hz", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.force60HzCheckBox.Location = new System.Drawing.Point(407, 109); + this.force60HzCheckBox.Location = new System.Drawing.Point(543, 134); + this.force60HzCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.force60HzCheckBox.Name = "force60HzCheckBox"; - this.force60HzCheckBox.Size = new System.Drawing.Size(81, 15); + this.force60HzCheckBox.Size = new System.Drawing.Size(89, 17); this.force60HzCheckBox.TabIndex = 2; this.force60HzCheckBox.Text = "Force 60Hz"; this.force60HzCheckBox.UseVisualStyleBackColor = true; @@ -1002,9 +1069,10 @@ private void InitializeComponent() this.suppressFrameDropCheckBox.AutoSize = true; this.suppressFrameDropCheckBox.Checked = global::ALVR.Properties.Settings.Default.suppressFrameDrop; this.suppressFrameDropCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "suppressFrameDrop", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.suppressFrameDropCheckBox.Location = new System.Drawing.Point(407, 64); + this.suppressFrameDropCheckBox.Location = new System.Drawing.Point(543, 79); + this.suppressFrameDropCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.suppressFrameDropCheckBox.Name = "suppressFrameDropCheckBox"; - this.suppressFrameDropCheckBox.Size = new System.Drawing.Size(132, 15); + this.suppressFrameDropCheckBox.Size = new System.Drawing.Size(149, 17); this.suppressFrameDropCheckBox.TabIndex = 2; this.suppressFrameDropCheckBox.Text = "Suppress frame drop"; this.suppressFrameDropCheckBox.UseVisualStyleBackColor = true; @@ -1015,9 +1083,10 @@ private void InitializeComponent() this.onlySteamVRCheckBox.AutoSize = true; this.onlySteamVRCheckBox.Checked = global::ALVR.Properties.Settings.Default.onlySteamVR; this.onlySteamVRCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "onlySteamVR", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.onlySteamVRCheckBox.Location = new System.Drawing.Point(407, 17); + this.onlySteamVRCheckBox.Location = new System.Drawing.Point(543, 21); + this.onlySteamVRCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.onlySteamVRCheckBox.Name = "onlySteamVRCheckBox"; - this.onlySteamVRCheckBox.Size = new System.Drawing.Size(221, 15); + this.onlySteamVRCheckBox.Size = new System.Drawing.Size(237, 17); this.onlySteamVRCheckBox.TabIndex = 2; this.onlySteamVRCheckBox.Text = "Launch only SteamVR without Steam."; this.onlySteamVRCheckBox.UseVisualStyleBackColor = true; @@ -1043,40 +1112,45 @@ private void InitializeComponent() this.debugTab.Controls.Add(this.debugCaptureOutputCheckBox); this.debugTab.Controls.Add(this.debugLogCheckBox); this.debugTab.HorizontalScrollbarBarColor = true; - this.debugTab.HorizontalScrollbarSize = 11; - this.debugTab.Location = new System.Drawing.Point(4, 35); + this.debugTab.HorizontalScrollbarSize = 14; + this.debugTab.Location = new System.Drawing.Point(4, 39); + this.debugTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.debugTab.Name = "debugTab"; - this.debugTab.Size = new System.Drawing.Size(656, 390); + this.debugTab.Size = new System.Drawing.Size(877, 485); this.debugTab.TabIndex = 2; this.debugTab.Text = "Debug"; this.debugTab.VerticalScrollbarBarColor = true; + this.debugTab.VerticalScrollbarSize = 13; // // metroLabel5 // this.metroLabel5.AutoSize = true; this.metroLabel5.CustomForeColor = true; this.metroLabel5.ForeColor = System.Drawing.Color.Red; - this.metroLabel5.Location = new System.Drawing.Point(88, 22); + this.metroLabel5.Location = new System.Drawing.Point(117, 27); + this.metroLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel5.Name = "metroLabel5"; - this.metroLabel5.Size = new System.Drawing.Size(148, 19); + this.metroLabel5.Size = new System.Drawing.Size(157, 20); this.metroLabel5.TabIndex = 11; this.metroLabel5.Text = "Do not touch this panel!"; // // logText // - this.logText.Location = new System.Drawing.Point(384, 12); + this.logText.Location = new System.Drawing.Point(512, 15); + this.logText.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.logText.Multiline = true; this.logText.Name = "logText"; this.logText.ReadOnly = true; - this.logText.Size = new System.Drawing.Size(253, 368); + this.logText.Size = new System.Drawing.Size(337, 453); this.logText.TabIndex = 10; // // metroCheckBox3 // this.metroCheckBox3.AutoSize = true; - this.metroCheckBox3.Location = new System.Drawing.Point(281, 226); + this.metroCheckBox3.Location = new System.Drawing.Point(375, 278); + this.metroCheckBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroCheckBox3.Name = "metroCheckBox3"; - this.metroCheckBox3.Size = new System.Drawing.Size(57, 15); + this.metroCheckBox3.Size = new System.Drawing.Size(60, 17); this.metroCheckBox3.TabIndex = 9; this.metroCheckBox3.Text = "Mutex"; this.metroCheckBox3.UseVisualStyleBackColor = true; @@ -1085,9 +1159,10 @@ private void InitializeComponent() // metroCheckBox2 // this.metroCheckBox2.AutoSize = true; - this.metroCheckBox2.Location = new System.Drawing.Point(156, 226); + this.metroCheckBox2.Location = new System.Drawing.Point(208, 278); + this.metroCheckBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroCheckBox2.Name = "metroCheckBox2"; - this.metroCheckBox2.Size = new System.Drawing.Size(68, 15); + this.metroCheckBox2.Size = new System.Drawing.Size(74, 17); this.metroCheckBox2.TabIndex = 9; this.metroCheckBox2.Text = "Suspend"; this.metroCheckBox2.UseVisualStyleBackColor = true; @@ -1096,79 +1171,88 @@ private void InitializeComponent() // metroCheckBox1 // this.metroCheckBox1.AutoSize = true; - this.metroCheckBox1.Location = new System.Drawing.Point(156, 192); + this.metroCheckBox1.Location = new System.Drawing.Point(208, 236); + this.metroCheckBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroCheckBox1.Name = "metroCheckBox1"; - this.metroCheckBox1.Size = new System.Drawing.Size(120, 15); + this.metroCheckBox1.Size = new System.Drawing.Size(130, 17); this.metroCheckBox1.TabIndex = 9; this.metroCheckBox1.Text = "DebugFrameIndex"; this.metroCheckBox1.UseVisualStyleBackColor = true; // // driverTestModeTextBox // - this.driverTestModeTextBox.Location = new System.Drawing.Point(159, 113); + this.driverTestModeTextBox.Location = new System.Drawing.Point(212, 139); + this.driverTestModeTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.driverTestModeTextBox.Name = "driverTestModeTextBox"; - this.driverTestModeTextBox.Size = new System.Drawing.Size(116, 25); + this.driverTestModeTextBox.Size = new System.Drawing.Size(155, 31); this.driverTestModeTextBox.TabIndex = 8; this.driverTestModeTextBox.Text = "0"; // // clientDebugFlagsTextBox // - this.clientDebugFlagsTextBox.Location = new System.Drawing.Point(159, 67); + this.clientDebugFlagsTextBox.Location = new System.Drawing.Point(212, 82); + this.clientDebugFlagsTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.clientDebugFlagsTextBox.Name = "clientDebugFlagsTextBox"; - this.clientDebugFlagsTextBox.Size = new System.Drawing.Size(116, 25); + this.clientDebugFlagsTextBox.Size = new System.Drawing.Size(155, 31); this.clientDebugFlagsTextBox.TabIndex = 8; this.clientDebugFlagsTextBox.Text = "0"; // // metroLabel2 // this.metroLabel2.AutoSize = true; - this.metroLabel2.Location = new System.Drawing.Point(1, 117); + this.metroLabel2.Location = new System.Drawing.Point(1, 144); + this.metroLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel2.Name = "metroLabel2"; - this.metroLabel2.Size = new System.Drawing.Size(139, 19); + this.metroLabel2.Size = new System.Drawing.Size(149, 20); this.metroLabel2.TabIndex = 7; this.metroLabel2.Text = "EnableDriverTestMode"; // // metroLabel1 // this.metroLabel1.AutoSize = true; - this.metroLabel1.Location = new System.Drawing.Point(1, 73); + this.metroLabel1.Location = new System.Drawing.Point(1, 90); + this.metroLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel1.Name = "metroLabel1"; - this.metroLabel1.Size = new System.Drawing.Size(111, 19); + this.metroLabel1.Size = new System.Drawing.Size(117, 20); this.metroLabel1.TabIndex = 7; this.metroLabel1.Text = "client debugFlags"; // // metroButton5 // - this.metroButton5.Location = new System.Drawing.Point(281, 192); + this.metroButton5.Location = new System.Drawing.Point(375, 236); + this.metroButton5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroButton5.Name = "metroButton5"; - this.metroButton5.Size = new System.Drawing.Size(75, 25); + this.metroButton5.Size = new System.Drawing.Size(100, 31); this.metroButton5.TabIndex = 6; this.metroButton5.Text = "Send"; this.metroButton5.Click += new System.EventHandler(this.metroButton5_Click); // // packetlossButton // - this.packetlossButton.Location = new System.Drawing.Point(250, 249); + this.packetlossButton.Location = new System.Drawing.Point(333, 306); + this.packetlossButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.packetlossButton.Name = "packetlossButton"; - this.packetlossButton.Size = new System.Drawing.Size(106, 25); + this.packetlossButton.Size = new System.Drawing.Size(141, 31); this.packetlossButton.TabIndex = 6; this.packetlossButton.Text = "Cause packet loss"; this.packetlossButton.Click += new System.EventHandler(this.packetlossButton_Click); // // metroButton4 // - this.metroButton4.Location = new System.Drawing.Point(70, 160); + this.metroButton4.Location = new System.Drawing.Point(93, 197); + this.metroButton4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.metroButton4.Name = "metroButton4"; - this.metroButton4.Size = new System.Drawing.Size(75, 25); + this.metroButton4.Size = new System.Drawing.Size(100, 31); this.metroButton4.TabIndex = 6; this.metroButton4.Text = "GetConfig"; this.metroButton4.Click += new System.EventHandler(this.metroButton4_Click); // // captureLayerDDSButton // - this.captureLayerDDSButton.Location = new System.Drawing.Point(156, 160); + this.captureLayerDDSButton.Location = new System.Drawing.Point(208, 197); + this.captureLayerDDSButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.captureLayerDDSButton.Name = "captureLayerDDSButton"; - this.captureLayerDDSButton.Size = new System.Drawing.Size(96, 25); + this.captureLayerDDSButton.Size = new System.Drawing.Size(128, 31); this.captureLayerDDSButton.TabIndex = 6; this.captureLayerDDSButton.Text = "Capture Layer"; this.captureLayerDDSButton.Click += new System.EventHandler(this.captureLayerDDSButton_Click); @@ -1178,9 +1262,10 @@ private void InitializeComponent() this.debugCaptureOutputCheckBox.AutoSize = true; this.debugCaptureOutputCheckBox.Checked = global::ALVR.Properties.Settings.Default.debugCaptureOutput; this.debugCaptureOutputCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "debugCaptureOutput", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.debugCaptureOutputCheckBox.Location = new System.Drawing.Point(7, 226); + this.debugCaptureOutputCheckBox.Location = new System.Drawing.Point(9, 278); + this.debugCaptureOutputCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.debugCaptureOutputCheckBox.Name = "debugCaptureOutputCheckBox"; - this.debugCaptureOutputCheckBox.Size = new System.Drawing.Size(138, 15); + this.debugCaptureOutputCheckBox.Size = new System.Drawing.Size(149, 17); this.debugCaptureOutputCheckBox.TabIndex = 9; this.debugCaptureOutputCheckBox.Text = "DebugCaptureOutput"; this.debugCaptureOutputCheckBox.UseVisualStyleBackColor = true; @@ -1190,9 +1275,10 @@ private void InitializeComponent() this.debugLogCheckBox.AutoSize = true; this.debugLogCheckBox.Checked = global::ALVR.Properties.Settings.Default.debugLog; this.debugLogCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::ALVR.Properties.Settings.Default, "debugLog", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)); - this.debugLogCheckBox.Location = new System.Drawing.Point(7, 192); + this.debugLogCheckBox.Location = new System.Drawing.Point(9, 236); + this.debugLogCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.debugLogCheckBox.Name = "debugLogCheckBox"; - this.debugLogCheckBox.Size = new System.Drawing.Size(78, 15); + this.debugLogCheckBox.Size = new System.Drawing.Size(85, 17); this.debugLogCheckBox.TabIndex = 9; this.debugLogCheckBox.Text = "DebugLog"; this.debugLogCheckBox.UseVisualStyleBackColor = true; @@ -1209,22 +1295,25 @@ private void InitializeComponent() this.aboutTab.Controls.Add(this.versionLabel); this.aboutTab.Controls.Add(this.metroLabel6); this.aboutTab.HorizontalScrollbarBarColor = true; - this.aboutTab.HorizontalScrollbarSize = 11; - this.aboutTab.Location = new System.Drawing.Point(4, 35); + this.aboutTab.HorizontalScrollbarSize = 14; + this.aboutTab.Location = new System.Drawing.Point(4, 39); + this.aboutTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.aboutTab.Name = "aboutTab"; - this.aboutTab.Size = new System.Drawing.Size(656, 390); + this.aboutTab.Size = new System.Drawing.Size(877, 485); this.aboutTab.TabIndex = 4; this.aboutTab.Text = "About"; this.aboutTab.VerticalScrollbarBarColor = true; + this.aboutTab.VerticalScrollbarSize = 13; // // driverLabel // this.driverLabel.AutoSize = true; this.driverLabel.FontWeight = MetroFramework.MetroLabelWeight.Regular; this.driverLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.driverLabel.Location = new System.Drawing.Point(91, 287); + this.driverLabel.Location = new System.Drawing.Point(121, 353); + this.driverLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.driverLabel.Name = "driverLabel"; - this.driverLabel.Size = new System.Drawing.Size(138, 19); + this.driverLabel.Size = new System.Drawing.Size(149, 20); this.driverLabel.Style = MetroFramework.MetroColorStyle.Green; this.driverLabel.TabIndex = 6; this.driverLabel.Text = "Driver is not installed"; @@ -1232,27 +1321,30 @@ private void InitializeComponent() // // uninstallButton // - this.uninstallButton.Location = new System.Drawing.Point(164, 321); + this.uninstallButton.Location = new System.Drawing.Point(219, 395); + this.uninstallButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.uninstallButton.Name = "uninstallButton"; - this.uninstallButton.Size = new System.Drawing.Size(109, 25); + this.uninstallButton.Size = new System.Drawing.Size(145, 31); this.uninstallButton.TabIndex = 5; this.uninstallButton.Text = "Uninstall driver"; this.uninstallButton.Click += new System.EventHandler(this.uninstallButton_Click); // // listDriversButton // - this.listDriversButton.Location = new System.Drawing.Point(107, 355); + this.listDriversButton.Location = new System.Drawing.Point(143, 437); + this.listDriversButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.listDriversButton.Name = "listDriversButton"; - this.listDriversButton.Size = new System.Drawing.Size(98, 25); + this.listDriversButton.Size = new System.Drawing.Size(131, 31); this.listDriversButton.TabIndex = 5; this.listDriversButton.Text = "List drivers"; this.listDriversButton.Click += new System.EventHandler(this.listDriversButton_Click); // // installButton // - this.installButton.Location = new System.Drawing.Point(46, 321); + this.installButton.Location = new System.Drawing.Point(61, 395); + this.installButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.installButton.Name = "installButton"; - this.installButton.Size = new System.Drawing.Size(98, 25); + this.installButton.Size = new System.Drawing.Size(131, 31); this.installButton.TabIndex = 5; this.installButton.Text = "Install driver"; this.installButton.Click += new System.EventHandler(this.installButton_Click); @@ -1260,38 +1352,42 @@ private void InitializeComponent() // metroLabel15 // this.metroLabel15.AutoSize = true; - this.metroLabel15.Location = new System.Drawing.Point(308, 16); + this.metroLabel15.Location = new System.Drawing.Point(411, 20); + this.metroLabel15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel15.Name = "metroLabel15"; - this.metroLabel15.Size = new System.Drawing.Size(125, 19); + this.metroLabel15.Size = new System.Drawing.Size(136, 20); this.metroLabel15.TabIndex = 4; this.metroLabel15.Text = "Opensource license:"; // // metroLabel14 // this.metroLabel14.AutoSize = true; - this.metroLabel14.Location = new System.Drawing.Point(31, 55); + this.metroLabel14.Location = new System.Drawing.Point(41, 68); + this.metroLabel14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel14.Name = "metroLabel14"; - this.metroLabel14.Size = new System.Drawing.Size(213, 19); + this.metroLabel14.Size = new System.Drawing.Size(227, 20); this.metroLabel14.TabIndex = 4; this.metroLabel14.Text = "The opensource remote VR display"; // // licenseTextBox // - this.licenseTextBox.Location = new System.Drawing.Point(308, 40); + this.licenseTextBox.Location = new System.Drawing.Point(411, 49); + this.licenseTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.licenseTextBox.Multiline = true; this.licenseTextBox.Name = "licenseTextBox"; this.licenseTextBox.ReadOnly = true; this.licenseTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.licenseTextBox.Size = new System.Drawing.Size(335, 340); + this.licenseTextBox.Size = new System.Drawing.Size(447, 418); this.licenseTextBox.TabIndex = 3; // // versionLabel // this.versionLabel.AutoSize = true; this.versionLabel.FontSize = MetroFramework.MetroLabelSize.Tall; - this.versionLabel.Location = new System.Drawing.Point(73, 16); + this.versionLabel.Location = new System.Drawing.Point(97, 20); + this.versionLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(39, 25); + this.versionLabel.Size = new System.Drawing.Size(42, 25); this.versionLabel.TabIndex = 2; this.versionLabel.Text = "v1.0"; // @@ -1299,9 +1395,10 @@ private void InitializeComponent() // this.metroLabel6.AutoSize = true; this.metroLabel6.FontSize = MetroFramework.MetroLabelSize.Tall; - this.metroLabel6.Location = new System.Drawing.Point(17, 16); + this.metroLabel6.Location = new System.Drawing.Point(23, 20); + this.metroLabel6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel6.Name = "metroLabel6"; - this.metroLabel6.Size = new System.Drawing.Size(50, 25); + this.metroLabel6.Size = new System.Drawing.Size(53, 25); this.metroLabel6.TabIndex = 2; this.metroLabel6.Text = "ALVR"; // @@ -1310,18 +1407,20 @@ private void InitializeComponent() this.metroLabel3.CustomBackground = true; this.metroLabel3.CustomForeColor = true; this.metroLabel3.FontWeight = MetroFramework.MetroLabelWeight.Regular; - this.metroLabel3.Location = new System.Drawing.Point(517, 31); + this.metroLabel3.Location = new System.Drawing.Point(689, 38); + this.metroLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.metroLabel3.Name = "metroLabel3"; - this.metroLabel3.Size = new System.Drawing.Size(115, 42); + this.metroLabel3.Size = new System.Drawing.Size(153, 52); this.metroLabel3.TabIndex = 9; this.metroLabel3.Text = "metroLabel3"; this.metroLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // startServerButton // - this.startServerButton.Location = new System.Drawing.Point(376, 35); + this.startServerButton.Location = new System.Drawing.Point(501, 43); + this.startServerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.startServerButton.Name = "startServerButton"; - this.startServerButton.Size = new System.Drawing.Size(75, 39); + this.startServerButton.Size = new System.Drawing.Size(100, 48); this.startServerButton.TabIndex = 10; this.startServerButton.Text = "Start server"; this.startServerButton.Click += new System.EventHandler(this.metroButton6_Click); @@ -1334,9 +1433,10 @@ private void InitializeComponent() // pictureBox1 // this.pictureBox1.Image = global::ALVR.Properties.Resources.alvr_128; - this.pictureBox1.Location = new System.Drawing.Point(93, 13); + this.pictureBox1.Location = new System.Drawing.Point(124, 16); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(48, 52); + this.pictureBox1.Size = new System.Drawing.Size(64, 64); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 11; this.pictureBox1.TabStop = false; @@ -1347,17 +1447,18 @@ private void InitializeComponent() // // Launcher // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(710, 522); + this.ClientSize = new System.Drawing.Size(947, 642); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.startServerButton); this.Controls.Add(this.metroProgressSpinner1); this.Controls.Add(this.metroLabel3); this.Controls.Add(this.metroTabControl1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "Launcher"; - this.Padding = new System.Windows.Forms.Padding(20, 65, 20, 22); + this.Padding = new System.Windows.Forms.Padding(27, 80, 27, 27); this.Text = "ALVR"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Launcher_FormClosed); this.Load += new System.EventHandler(this.Launcher_Load); diff --git a/ALVR/ServerConfig.cs b/ALVR/ServerConfig.cs index 656e7493a9..8abcc5ea22 100644 --- a/ALVR/ServerConfig.cs +++ b/ALVR/ServerConfig.cs @@ -151,6 +151,8 @@ public bool Save(DeviceDescriptor device) driverConfig.refreshRate = DEFAULT_REFRESHRATE; driverConfig.renderWidth = DEFAULT_WIDTH; driverConfig.renderHeight = DEFAULT_HEIGHT; + driverConfig.recomendedRenderWidth = DEFAULT_WIDTH; + driverConfig.recomendedRenderHeight = DEFAULT_HEIGHT; driverConfig.autoConnectHost = ""; driverConfig.autoConnectPort = 0; @@ -162,6 +164,8 @@ public bool Save(DeviceDescriptor device) driverConfig.refreshRate = device.RefreshRates[0] == 0 ? DEFAULT_REFRESHRATE : device.RefreshRates[0]; driverConfig.renderWidth = device.DefaultWidth * c.resolutionScale / 100; driverConfig.renderHeight = device.DefaultHeight * c.resolutionScale / 100; + driverConfig.recommendedRenderWidth = device.DefaultWidth; + driverConfig.recommendedRenderHeight = device.DefaultHeight; driverConfig.autoConnectHost = device.ClientHost; driverConfig.autoConnectPort = device.ClientPort; diff --git a/alvr_server/OvrDisplayComponent.cpp b/alvr_server/OvrDisplayComponent.cpp index 352acb9352..5412a805fe 100644 --- a/alvr_server/OvrDisplayComponent.cpp +++ b/alvr_server/OvrDisplayComponent.cpp @@ -24,8 +24,8 @@ void OvrDisplayComponent::GetWindowBounds(int32_t *pnX, int32_t *pnY, uint32_t * void OvrDisplayComponent::GetRecommendedRenderTargetSize(uint32_t *pnWidth, uint32_t *pnHeight) { - *pnWidth = Settings::Instance().m_renderWidth / 2; - *pnHeight = Settings::Instance().m_renderHeight; + *pnWidth = Settings::Instance().m_recommendedTargetWidth / 2; + *pnHeight = Settings::Instance().m_recommendedTargetHeight; Log(L"GetRecommendedRenderTargetSize %dx%d", *pnWidth, *pnHeight); } diff --git a/alvr_server/Settings.cpp b/alvr_server/Settings.cpp index 80b3979d82..e19d89fc60 100644 --- a/alvr_server/Settings.cpp +++ b/alvr_server/Settings.cpp @@ -55,6 +55,9 @@ void Settings::Load() m_renderWidth = (int32_t)v.get(k_pch_Settings_RenderWidth_Int32).get(); m_renderHeight = (int32_t)v.get(k_pch_Settings_RenderHeight_Int32).get(); + m_recommendedTargetWidth = (int32_t)v.get(k_pch_Settings_RecommendedRenderWidth_Int32).get(); + m_recommendedTargetHeight = (int32_t)v.get(k_pch_Settings_RecommendedRenderHeight_Int32).get(); + picojson::array& eyeFov = v.get(k_pch_Settings_EyeFov).get(); for (int eye = 0; eye < 2; eye++) { diff --git a/alvr_server/Settings.h b/alvr_server/Settings.h index e2abc9be33..88b0aa1af8 100644 --- a/alvr_server/Settings.h +++ b/alvr_server/Settings.h @@ -19,6 +19,8 @@ static const char * const k_pch_Settings_RegisteredDeviceType_String = "register static const char * const k_pch_Settings_RefreshRate_Int32 = "refreshRate"; static const char * const k_pch_Settings_RenderWidth_Int32 = "renderWidth"; static const char * const k_pch_Settings_RenderHeight_Int32 = "renderHeight"; +static const char * const k_pch_Settings_RecommendedRenderWidth_Int32 = "recommendedRenderWidth"; +static const char * const k_pch_Settings_RecommendedRenderHeight_Int32 = "recommendedRenderHeight"; static const char * const k_pch_Settings_EyeFov = "eyeFov"; static const char * const k_pch_Settings_IPD_Float = "IPD"; static const char * const k_pch_Settings_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons"; @@ -130,6 +132,10 @@ class Settings int m_refreshRate; int32_t m_renderWidth; int32_t m_renderHeight; + int32_t m_recommendedTargetWidth; + int32_t m_recommendedTargetHeight; + + EyeFov m_eyeFov[2]; float m_flSecondsFromVsyncToPhotons; float m_flIPD;