diff --git a/DesktopEdge/IdentityDetails.xaml b/DesktopEdge/IdentityDetails.xaml
index 079690c2..d2472688 100644
--- a/DesktopEdge/IdentityDetails.xaml
+++ b/DesktopEdge/IdentityDetails.xaml
@@ -29,8 +29,8 @@
-
-
+
+
diff --git a/DesktopEdge/IdentityDetails.xaml.cs b/DesktopEdge/IdentityDetails.xaml.cs
index 68ab8d36..68635e7d 100644
--- a/DesktopEdge/IdentityDetails.xaml.cs
+++ b/DesktopEdge/IdentityDetails.xaml.cs
@@ -26,6 +26,8 @@ namespace ZitiDesktopEdge {
public event Forgot OnForgot;
public delegate void ErrorOccurred(string message);
public event ErrorOccurred OnError;
+ public delegate void Detched(MouseButtonEventArgs e);
+ public event Detched OnDetach;
public double MainHeight = 500;
private List identities {
@@ -52,6 +54,13 @@ namespace ZitiDesktopEdge {
public IdentityItem SelectedIdentity { get; set; }
+ private void Window_MouseDown(object sender, MouseButtonEventArgs e) {
+ if (e.ChangedButton == MouseButton.Left) {
+ _isAttached = false;
+ OnDetach(e);
+ }
+ }
+
public bool IsAttached {
get {
diff --git a/DesktopEdge/MainMenu.xaml b/DesktopEdge/MainMenu.xaml
index f249f99d..1f744639 100644
--- a/DesktopEdge/MainMenu.xaml
+++ b/DesktopEdge/MainMenu.xaml
@@ -32,7 +32,7 @@
-
+
diff --git a/DesktopEdge/MainMenu.xaml.cs b/DesktopEdge/MainMenu.xaml.cs
index 1a28ca91..678c29e0 100644
--- a/DesktopEdge/MainMenu.xaml.cs
+++ b/DesktopEdge/MainMenu.xaml.cs
@@ -26,6 +26,8 @@ namespace ZitiDesktopEdge
public event AttachementChanged OnAttachmentChange;
public delegate void LogLevelChanged(string level);
public event LogLevelChanged OnLogLevelChanged;
+ public delegate void Detched(MouseButtonEventArgs e);
+ public event Detched OnDetach;
public string menuState = "Main";
public string licenseData = "it's open source.";
public string LogLevel = "";
@@ -43,6 +45,11 @@ namespace ZitiDesktopEdge
UpdateState();
MainMenuArea.Visibility = Visibility.Collapsed;
}
+ private void Window_MouseDown(object sender, MouseButtonEventArgs e) {
+ if (e.ChangedButton == MouseButton.Left) {
+ OnDetach(e);
+ }
+ }
private void CloseApp(object sender, MouseButtonEventArgs e) {
Application.Current.Shutdown();
diff --git a/DesktopEdge/MainWindow.xaml.cs b/DesktopEdge/MainWindow.xaml.cs
index 229cb535..5765d559 100644
--- a/DesktopEdge/MainWindow.xaml.cs
+++ b/DesktopEdge/MainWindow.xaml.cs
@@ -66,12 +66,28 @@ namespace ZitiDesktopEdge {
notifyIcon.Visible = true;
notifyIcon.Click += TargetNotifyIcon_Click;
notifyIcon.Visible = true;
+ IdentityMenu.OnDetach += OnDetach;
+ MainMenu.OnDetach += OnDetach;
LaunchOrInstall();
SetNotifyIcon("white");
}
+ private void Window_MouseDown(object sender, MouseButtonEventArgs e) {
+ OnDetach(e);
+ }
+
+ private void OnDetach(MouseButtonEventArgs e) {
+ if (e.ChangedButton == MouseButton.Left) {
+ _isAttached = false;
+ IdentityMenu.Arrow.Visibility = Visibility.Collapsed;
+ Arrow.Visibility = Visibility.Collapsed;
+ MainMenu.Detach();
+ this.DragMove();
+ }
+ }
+
private void MainWindow_Activated(object sender, EventArgs e) {
this.Visibility = Visibility.Visible;
Placement();
@@ -105,16 +121,6 @@ namespace ZitiDesktopEdge {
SetCantDisplay("Service Not Started", "Start the Ziti Tunnel Service to get started");
}
- private void Window_MouseDown(object sender, MouseButtonEventArgs e) {
- if (e.ChangedButton == MouseButton.Left) {
- _isAttached = false;
- IdentityMenu.Arrow.Visibility = Visibility.Collapsed;
- Arrow.Visibility = Visibility.Collapsed;
- MainMenu.Detach();
- this.DragMove();
- }
- }
-
private void TargetNotifyIcon_Click(object sender, EventArgs e) {
this.Show();
this.Activate();
diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go
index a8e63c13..364d4b81 100644
--- a/service/ziti-tunnel/version.go
+++ b/service/ziti-tunnel/version.go
@@ -20,9 +20,9 @@
package main
const (
- Version = "1.3.4"
- Revision = "af9d0a33f647"
- Branch = "release-1.3.4"
+ Version = "1.2.15"
+ Revision = "12439f31b02c"
+ Branch = "release-1.3.4-dragger"
BuildUser = ""
- BuildDate = "2020-11-02 13:16:40"
+ BuildDate = "2020-11-02 13:45:50"
)