From 44d1bd14bd2f9c22fee6b57ac3df4018db146e1d Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Tue, 19 May 2015 14:48:57 -0700
Subject: Enable right-click menu for copy/paste/etc. in Windows UI wrapper.

---
 ext/bin/win-ui-wrapper/ZeroTier One.exe   | Bin 0 -> 761304 bytes
 ext/installfiles/windows/ZeroTier One.aip |   2 +-
 ext/win-ui-wrapper/ZeroTier One.exe       | Bin 761304 -> 0 bytes
 windows/WebUIWrapper/Form1.Designer.cs    |  11 ++++++-----
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 ext/bin/win-ui-wrapper/ZeroTier One.exe
 delete mode 100644 ext/win-ui-wrapper/ZeroTier One.exe

diff --git a/ext/bin/win-ui-wrapper/ZeroTier One.exe b/ext/bin/win-ui-wrapper/ZeroTier One.exe
new file mode 100644
index 00000000..50eec7d6
Binary files /dev/null and b/ext/bin/win-ui-wrapper/ZeroTier One.exe differ
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index aef8ba5a..bab72e04 100644
--- a/ext/installfiles/windows/ZeroTier One.aip	
+++ b/ext/installfiles/windows/ZeroTier One.aip	
@@ -81,7 +81,7 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
     <ROW File="WdfCoinstaller01011.dll" Component_="WdfCoinstaller01011.dll" FileName="WDFCOI~1.DLL|WdfCoinstaller01011.dll" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x64\WdfCoinstaller01011.dll" SelfReg="false" NextFile="WdfCoinstaller01011.dll_1"/>
     <ROW File="WdfCoinstaller01011.dll_1" Component_="WdfCoinstaller01011.dll_1" FileName="WDFCOI~1.DLL|WdfCoinstaller01011.dll" Attributes="0" SourcePath="..\..\bin\tap-windows-ndis6\x86\WdfCoinstaller01011.dll" SelfReg="false" NextFile="zttap300.cat_2"/>
-    <ROW File="ZeroTierOne.exe" Component_="ZeroTierOne.exe" FileName="ZEROTI~1.EXE|ZeroTier One.exe" Attributes="0" SourcePath="..\..\win-ui-wrapper\ZeroTier One.exe" SelfReg="false" NextFile="WdfCoinstaller01011.dll"/>
+    <ROW File="ZeroTierOne.exe" Component_="ZeroTierOne.exe" FileName="ZEROTI~1.EXE|ZeroTier One.exe" Attributes="0" SourcePath="..\..\bin\win-ui-wrapper\ZeroTier One.exe" SelfReg="false" NextFile="WdfCoinstaller01011.dll"/>
     <ROW File="devcon_x64.exe" Component_="devcon_x64.exe" FileName="DEVCON~1.EXE|devcon_x64.exe" Attributes="0" SourcePath="..\..\bin\devcon\devcon_x64.exe" SelfReg="false" NextFile="devcon_x86.exe"/>
     <ROW File="devcon_x86.exe" Component_="devcon_x86.exe" FileName="DEVCON~2.EXE|devcon_x86.exe" Attributes="0" SourcePath="..\..\bin\devcon\devcon_x86.exe" SelfReg="false" NextFile="zerotierone_x86.exe"/>
     <ROW File="index.html" Component_="index.html" FileName="INDEX~1.HTM|index.html" Attributes="0" SourcePath="..\..\..\ui\index.html" SelfReg="false" NextFile="main.js"/>
diff --git a/ext/win-ui-wrapper/ZeroTier One.exe b/ext/win-ui-wrapper/ZeroTier One.exe
deleted file mode 100644
index 3e129be7..00000000
Binary files a/ext/win-ui-wrapper/ZeroTier One.exe and /dev/null differ
diff --git a/windows/WebUIWrapper/Form1.Designer.cs b/windows/WebUIWrapper/Form1.Designer.cs
index 8d8eb9e9..81d69cd0 100644
--- a/windows/WebUIWrapper/Form1.Designer.cs
+++ b/windows/WebUIWrapper/Form1.Designer.cs
@@ -36,20 +36,21 @@
             // 
             this.webContainer.AllowNavigation = false;
             this.webContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.webContainer.IsWebBrowserContextMenuEnabled = false;
             this.webContainer.Location = new System.Drawing.Point(0, 0);
-            this.webContainer.MinimumSize = new System.Drawing.Size(20, 20);
+            this.webContainer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.webContainer.MinimumSize = new System.Drawing.Size(18, 16);
             this.webContainer.Name = "webContainer";
-            this.webContainer.Size = new System.Drawing.Size(1012, 556);
+            this.webContainer.Size = new System.Drawing.Size(900, 445);
             this.webContainer.TabIndex = 0;
             // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1012, 556);
+            this.ClientSize = new System.Drawing.Size(900, 445);
             this.Controls.Add(this.webContainer);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Form1";
             this.Text = "ZeroTier One";
             this.Load += new System.EventHandler(this.Form1_Load);
-- 
cgit v1.2.3