edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #1327 from MathemanFlo/TooltipImprovements

Browse Source 
Tooltip improvements
This commit is contained in:
Lubos Lenco
2022-03-11 09:08:52 +01:00
committed by GitHub
parent a10e65cb09 3200784895
commit 335458093d
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/TabBrushes.hx
+1 -1
View File
@@ -102,7 +102,7 @@ class TabBrushes {
iron.App.notifyOnInit(_init);
}
if (Project.brushes.length > 1 && ui.button(tr("Delete"), Left)) {
if (Project.brushes.length > 1 && ui.button(tr("Delete"), Left, "delete")) {
deleteBrush(Project.brushes[i]);
}
}, 3 + add);
Sources/arm/ui/TabFonts.hx
+1 -1
View File
@@ -98,7 +98,7 @@ class TabFonts {
UIMenu.draw(function(ui: Zui) {
ui.text(fontName, Right, ui.t.HIGHLIGHT_COL);
if (Project.fonts.length > 1 && ui.button(tr("Delete"), Left) && Project.fonts[i].file != "") {
if (Project.fonts.length > 1 && ui.button(tr("Delete"), Left, "delete") && Project.fonts[i].file != "") {
deleteFont(Project.fonts[i]);
}
}, 1 + add);
Sources/arm/ui/TabLayers.hx
+1 -1
View File
@@ -543,7 +543,7 @@ class TabLayers {
}
ui.enabled = canDelete(l);
if (ui.button(tr("Delete"), Left)) {
if (ui.button(tr("Delete"), Left, "delete")) {
deleteLayer(l);
}
ui.enabled = true;
Sources/arm/ui/TabMaterials.hx
+1 -1
View File
@@ -139,7 +139,7 @@ class TabMaterials {
iron.App.notifyOnInit(_init);
}
if (Project.materials.length > 1 && ui.button(tr("Delete"), Left)) {
if (Project.materials.length > 1 && ui.button(tr("Delete"), Left, "delete")) {
deleteMaterial(m);
}
Sources/arm/ui/TabSwatches.hx
+1 -1
View File
@@ -158,7 +158,7 @@ class TabSwatches {
Krom.copyToClipboard(untyped val.toString(16));
}
#end
else if (Project.raw.swatches.length > 1 && ui.button(tr("Delete"), Left)) {
else if (Project.raw.swatches.length > 1 && ui.button(tr("Delete"), Left, "delete")) {
deleteSwatch(Project.raw.swatches[i]);
}
}, 2 + add);
Sources/arm/ui/TabTextures.hx
+1 -1
View File
@@ -146,7 +146,7 @@ class TabTextures {
Context.ddirty = 2;
}
}
if (ui.button(tr("Delete"), Left)) {
if (ui.button(tr("Delete"), Left, "delete")) {
deleteTexture(asset);
}
if (!isPacked && ui.button(tr("Open Containing Directory..."), Left)) {
Sources/arm/ui/UIMenu.hx
+9
View File
@@ -141,6 +141,7 @@ class UIMenu {
}
menuAlign(ui);
Context.envmapAngle = ui.slider(envaHandle, tr("Environment Angle"), 0.0, 360.0, true, 1) / 180.0 * Math.PI;
if (ui.isHovered) ui.tooltip(tr("{shortcut} and move mouse", ["shortcut" => Config.keymap.rotate_envmap]));
if (envaHandle.changed) Context.ddirty = 2;
if (Scene.active.lights.length > 0) {
@@ -161,6 +162,7 @@ class UIMenu {
lahandle.value = Context.lightAngle / Math.PI * 180;
menuAlign(ui);
var newAngle = ui.slider(lahandle, tr("Light Angle"), 0.0, 360.0, true, 1) / 180 * Math.PI;
if (ui.isHovered) ui.tooltip(tr("{shortcut} and move mouse", ["shortcut" => Config.keymap.rotate_light]));
var ldiff = newAngle - Context.lightAngle;
if (Math.abs(ldiff) > 0.005) {
if (newAngle < 0) newAngle += (Std.int(-newAngle / (2 * Math.PI)) + 1) * 2 * Math.PI;
@@ -351,7 +353,14 @@ class UIMenu {
menuFill(ui);
menuAlign(ui);
Context.cameraControls = Ext.inlineRadio(ui, Id.handle({ position: Context.cameraControls }), [tr("Orbit"), tr("Rotate"), tr("Fly")], Left);
var orbitAndRotateTooltip = tr("Orbit and Rotate mode:\n{rotate_shortcut} or move right mouse button to rotate.\n{zoom_shortcut} or scroll to zoom.\n{pan_shortcut} or move middle mouse to pan.",
["rotate_shortcut" => Config.keymap.action_rotate,
"zoom_shortcut" => Config.keymap.action_zoom,
"pan_shortcut" => Config.keymap.action_pan,
]);
var flyTooltip = tr("Fly mode:\nHold the right mouse button and one of the following commands:\nmove mouse to rotate.\nw, up or scroll up to move forward.\ns, down or scroll down to move backward.\na or left to move left.\nd or right to move right.\ne to move up.\nq to move down.\nHold shift to move faster or alt to move slower.");
if (ui.isHovered) ui.tooltip(orbitAndRotateTooltip + "\n\n" + flyTooltip);
menuFill(ui);
menuAlign(ui);
Context.cameraType = Ext.inlineRadio(ui, Context.camHandle, [tr("Perspective"), tr("Orthographic")], Left);