From df0ba13d37565ab867dddba15794b832212ad104 Mon Sep 17 00:00:00 2001
From: unknown <lubos.lenco@gmail.com>
Date: Tue, 23 Oct 2018 19:26:23 +0200
Subject: [PATCH] macOS fix

---
 Sources/arm/UITrait.hx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Sources/arm/UITrait.hx b/Sources/arm/UITrait.hx
index d9e18fad..0ff36452 100644
--- a/Sources/arm/UITrait.hx
+++ b/Sources/arm/UITrait.hx
@@ -165,6 +165,7 @@ class UITrait extends iron.Trait {
 	var ui:Zui;
 	public var windowW = 280; // Panel width
 	public var toolbarw = 50;
+	var systemId = "";
 
 	var colorIdHandle = Id.handle();
 
@@ -389,6 +390,7 @@ class UITrait extends iron.Trait {
 		super();
 
 		inst = this;
+		systemId = kha.System.systemId;
 
 		// Init config
 		apconfig = cast armory.data.Config.raw;
@@ -906,7 +908,10 @@ class UITrait extends iron.Trait {
 			ddirty = 3;
 		}
 
-		if (kb.down("control") && kb.started("z") && undoEnabled) {
+		var undoPressed = kb.down("control") && kb.started("z");
+		if (systemId == 'OSX') undoPressed = kb.started("z"); // cmd+z on macos
+
+		if (undoPressed && undoEnabled) {
 			// TODO: swap layers instead of images
 			var tp = selectedLayer.texpaint;
 			var tp_nor = selectedLayer.texpaint_nor;