diff --git a/Sources/arm/ui/TabConsole.hx b/Sources/arm/ui/TabConsole.hx index 16513561..517f956e 100644 --- a/Sources/arm/ui/TabConsole.hx +++ b/Sources/arm/ui/TabConsole.hx @@ -20,7 +20,11 @@ class TabConsole { if (ui.tab(UIStatus.inst.statustab, title, false, color) && statush > UIStatus.defaultStatusH * ui.SCALE()) { ui.beginSticky(); - ui.row([1 / 14, 1 / 14 #if !(kha_android || kha_ios) , 1 / 14 #end]); + #if (krom_windows || krom_linux || krom_darwin) + ui.row([1 / 14, 1 / 14, 1 / 14]); // Copy + #else + ui.row([1 / 14, 1 / 14]); + #end if (ui.button(tr("Clear"))) { Console.lastTraces = []; @@ -35,7 +39,7 @@ class TabConsole { Krom.fileSaveBytes(path, Bytes.ofString(str).getData()); }); } - #if !(kha_android || kha_ios) + #if (krom_windows || krom_linux || krom_darwin) if (ui.button(tr("Copy"))) { var str = Console.lastTraces.join("\n"); Krom.copyToClipboard(str); diff --git a/Sources/arm/ui/TabSwatches.hx b/Sources/arm/ui/TabSwatches.hx index ea5a99c1..442f8fc6 100644 --- a/Sources/arm/ui/TabSwatches.hx +++ b/Sources/arm/ui/TabSwatches.hx @@ -102,14 +102,18 @@ class TabSwatches { if (ui.isHovered && ui.inputReleasedR) { Context.setSwatch(Project.raw.swatches[i]); var add = Project.raw.swatches.length > 1 ? 1 : 0; + #if (krom_windows || krom_linux || krom_darwin) + add += 1; // Copy + #end + UIMenu.draw(function(ui: Zui) { ui.text(tr("Swatch"), Right, ui.t.HIGHLIGHT_COL); if (ui.button(tr("Duplicate"), Left)) { Context.setSwatch(Project.makeSwatch(Context.swatch.base)); Project.raw.swatches.push(Context.swatch); } - #if !(kha_android || kha_ios) - else if (ui.button(tr("Copy Hex code"), Left)) { + #if (krom_windows || krom_linux || krom_darwin) + else if (ui.button(tr("Copy"), Left)) { var val = untyped Context.swatch.base; if (val < 0) val += untyped 4294967296; Krom.copyToClipboard(untyped val.toString(16)); @@ -120,7 +124,7 @@ class TabSwatches { Project.raw.swatches.splice(i, 1); UIStatus.inst.statusHandle.redraws = 2; } - }, #if !(kha_android || kha_ios) 3 + add #else 2 + add #end); + }, 2 + add); } if (ui.isHovered) { var val = untyped Project.raw.swatches[i].base; diff --git a/Sources/arm/ui/UIBox.hx b/Sources/arm/ui/UIBox.hx index b9fe9566..a0e1cea5 100644 --- a/Sources/arm/ui/UIBox.hx +++ b/Sources/arm/ui/UIBox.hx @@ -67,16 +67,17 @@ class UIBox { Ext.textArea(ui, Id.handle({text: boxText}), false) : ui.text(boxText); ui.endElement(); - #if !(kha_android || kha_ios) - if(copyable) ui.row([1 / 3, 1 / 3, 1 / 3]); + + #if (krom_windows || krom_linux || krom_darwin) + if (copyable) ui.row([1 / 3, 1 / 3, 1 / 3]); else ui.row([2 / 3, 1 / 3]); #else ui.row([2 / 3, 1 / 3]); #end - ui.endElement(); - #if !(kha_android || kha_ios) + + #if (krom_windows || krom_linux || krom_darwin) if (copyable && ui.button(tr("Copy"))) { Krom.copyToClipboard(boxText); }