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

Merge pull request #1380 from MathemanFlo/ModeShortcut

Browse Source 
Improve menu mode shortcuts
This commit is contained in:
Lubos Lenco
2022-04-20 09:07:34 +02:00
committed by GitHub
parent d5e8184217 b32c79e0be
commit 3bf4df6989
5 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/keymap_presets/blender.json
+1
View File
@@ -46,6 +46,7 @@
"view_zoom_in": "",
"view_zoom_out": "",
"view_distract_free": "f11",
"viewport_mode_menu": "ctrl+m",
"tool_brush": "b",
"tool_eraser": "e",
"tool_fill": "g",
Assets/keymap_presets/default.json
+1
View File
@@ -46,6 +46,7 @@
"view_zoom_in": "",
"view_zoom_out": "",
"view_distract_free": "f11",
"viewport_mode_menu": "ctrl+m",
"tool_brush": "b",
"tool_eraser": "e",
"tool_fill": "g",
Sources/arm/KeymapFormat.hx
+1
View File
@@ -48,6 +48,7 @@ typedef TKeymap = {
public var view_zoom_in: String;
public var view_zoom_out: String;
public var view_distract_free: String;
public var viewport_mode_menu: String;
public var tool_brush: String;
public var tool_eraser: String;
public var tool_fill: String;
Sources/arm/ui/UIMenu.hx
+3 -1
View File
@@ -262,12 +262,14 @@ class UIMenu {
tr("Object ID"),
tr("Mask")
];
var shortcuts = [ "l", "b", "n", "o", "r", "m", "a", "h", "t", "1", "2", "3", "4" ];
#if (kha_direct3d12 || kha_vulkan)
modes.push(tr("Path Traced"));
shortcuts.push("p");
#end
for (i in 0...modes.length) {
menuFill(ui);
ui.radio(modeHandle, i, modes[i]);
ui.radio(modeHandle, i, modes[i], Config.keymap.viewport_mode_menu + ", " + shortcuts[i]);
}
if (modeHandle.changed) Context.setViewportMode(modeHandle.position);
Sources/arm/ui/UISidebar.hx
+1 -1
View File
@@ -365,7 +365,7 @@ class UISidebar {
else if (Operator.shortcut(Config.keymap.view_orbit_opposite)) Viewport.orbitOpposite();
else if (Operator.shortcut(Config.keymap.view_zoom_in, ShortcutRepeat)) Viewport.zoom(0.2);
else if (Operator.shortcut(Config.keymap.view_zoom_out, ShortcutRepeat)) Viewport.zoom(-0.2);
else if (Operator.shortcut("ctrl+m")) {
else if (Operator.shortcut(Config.keymap.viewport_mode_menu)) {
UIMenu.draw(function(ui: Zui) {
var modeHandle = Id.handle();
modeHandle.position = Context.viewportMode;