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: [PATCH] Enable right-click menu for copy/paste/etc. in Windows UI
 wrapper.

---
 ext/{ => bin}/win-ui-wrapper/ZeroTier One.exe | Bin 761304 -> 761304 bytes
 ext/installfiles/windows/ZeroTier One.aip     |   2 +-
 windows/WebUIWrapper/Form1.Designer.cs        |  11 ++++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename ext/{ => bin}/win-ui-wrapper/ZeroTier One.exe (98%)

diff --git a/ext/win-ui-wrapper/ZeroTier One.exe b/ext/bin/win-ui-wrapper/ZeroTier One.exe
similarity index 98%
rename from ext/win-ui-wrapper/ZeroTier One.exe
rename to ext/bin/win-ui-wrapper/ZeroTier One.exe
index 3e129be744d15494b7c4ae4b4d04fc91f447aea2..50eec7d6bf0ea90fc869e19356e11b5243d26688 100644
GIT binary patch
delta 2135
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

delta 2088
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

diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index aef8ba5a2..bab72e043 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/windows/WebUIWrapper/Form1.Designer.cs b/windows/WebUIWrapper/Form1.Designer.cs
index 8d8eb9e9b..81d69cd0e 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);