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

Improve menu display on iOS and Android

Browse Source
This commit is contained in:
Lubos Lenco
2021-05-11 12:46:33 +02:00
parent 83085f7d3b
commit f9b0448610
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/Config.hx
+7
View File
@@ -20,6 +20,13 @@ class Config {
public static var raw: TConfig = null;
public static var keymap: TKeymap;
public static var configLoaded = false;
#if (krom_android || krom_ios)
public static inline var buttonAlign = zui.Zui.Align.Center;
public static inline var buttonSpacing = "";
#else
public static inline var buttonAlign = zui.Zui.Align.Left;
public static inline var buttonSpacing = " ";
#end
public static function load(done: Void->Void) {
try {
Sources/arm/ui/UIMenu.hx
+17 -13
View File
@@ -135,8 +135,7 @@ class UIMenu {
var p = Scene.active.world.probe;
var envHandle = Id.handle();
envHandle.value = p.raw.strength;
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
p.raw.strength = ui.slider(envHandle, tr("Environment"), 0.0, 8.0, true);
if (envHandle.changed) Context.ddirty = 2;
@@ -148,16 +147,14 @@ class UIMenu {
var scale = 1333;
lhandle.value = light.data.raw.strength / scale;
lhandle.value = Std.int(lhandle.value * 100) / 100;
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
light.data.raw.strength = ui.slider(lhandle, tr("Light"), 0.0, 4.0, true) * scale;
if (lhandle.changed) Context.ddirty = 2;
menuFill(ui);
var sxhandle = Id.handle();
sxhandle.value = light.data.raw.size;
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
light.data.raw.size = ui.slider(sxhandle, tr("Light Size"), 0.0, 4.0, true);
if (sxhandle.changed) Context.ddirty = 2;
}
@@ -323,21 +320,18 @@ class UIMenu {
menuFill(ui);
var cam = Scene.active.camera;
Context.fovHandle = Id.handle({value: Std.int(cam.data.raw.fov * 100) / 100});
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
cam.data.raw.fov = ui.slider(Context.fovHandle, tr("FoV"), 0.3, 2.0, true);
if (Context.fovHandle.changed) {
ViewportUtil.updateCameraType(Context.cameraType);
}
menuFill(ui);
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
Context.cameraControls = Ext.inlineRadio(ui, Id.handle({position: Context.cameraControls}), [tr("Orbit"), tr("Rotate"), tr("Fly")], Left);
menuFill(ui);
ui.row([1 / 8, 7 / 8]);
ui.endElement();
menuAlign(ui);
Context.cameraType = Ext.inlineRadio(ui, Context.camHandle, [tr("Perspective"), tr("Orthographic")], Left);
if (ui.isHovered) ui.tooltip(tr("Camera Type") + ' (${Config.keymap.view_camera_type})');
if (Context.camHandle.changed) {
@@ -491,6 +485,16 @@ class UIMenu {
static function menuButton(ui: Zui, text: String, label = ""): Bool {
menuFill(ui);
return ui.button(" " + text, Left, label);
#if (krom_android || krom_ios)
label = "";
#end
return ui.button(Config.buttonSpacing + text, Config.buttonAlign, label);
}
static function menuAlign(ui: Zui) {
#if !(krom_android || krom_ios)
ui.row([1 / 8, 7 / 8]);
ui.endElement();
#end
}
}
Sources/arm/ui/UINodes.hx
+1 -1
View File
@@ -706,7 +706,7 @@ class UINodes {
ui.t.ELEMENT_OFFSET = 0;
for (n in list[menuCategory]) {
if (ui.button(" " + tr(n.name), Left)) {
if (ui.button(Config.buttonSpacing + tr(n.name), Config.buttonAlign)) {
pushUndo();
var canvas = getCanvas(true);
var nodes = getNodes();