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

Status bar message

Browse Source
This commit is contained in:
luboslenco
2019-02-25 13:28:46 +01:00
parent db2fd03bc9
commit 33e9d150a0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/Project.hx
+1 -1
View File
@@ -13,7 +13,7 @@ class Project {
arm.App.showFilename = false;
arm.App.filesDone = function(path:String) {
if (!StringTools.endsWith(path, ".arm")) {
UITrait.inst.showMessage(".arm file expected");
UITrait.inst.showMessage("Error: .arm file expected");
return;
}
importProject(path);
Sources/arm/UITrait.hx
+16 -8
View File
@@ -192,6 +192,7 @@ class UITrait extends iron.Trait {
public var projectExport = false;
var headerHandle = new Zui.Handle({layout:Horizontal});
var toolbarHandle = new Zui.Handle();
var statusHandle = new Zui.Handle({layout:Horizontal});
var drawMenu = false;
var menuCategory = 0;
@@ -336,9 +337,9 @@ class UITrait extends iron.Trait {
}
public function showMessage(s:String) {
messageTimer = 3.0;
messageTimer = 8.0;
message = s;
hwnd.redraws = 2;
statusHandle.redraws = 2;
}
function done() {
@@ -542,7 +543,10 @@ class UITrait extends iron.Trait {
function updateUI() {
messageTimer -= iron.system.Time.delta;
if (messageTimer > 0) {
messageTimer -= iron.system.Time.delta;
if (messageTimer <= 0) statusHandle.redraws = 2;
}
var mouse = iron.system.Input.getMouse();
var kb = iron.system.Input.getKeyboard();
@@ -1073,7 +1077,7 @@ class UITrait extends iron.Trait {
}
}
if (ui.window(Id.handle({layout:Horizontal}), iron.App.x(), arm.App.realh() - headerh, arm.App.realw() - toolbarw - windowW, headerh)) {
if (ui.window(statusHandle, iron.App.x(), arm.App.realh() - headerh, arm.App.realw() - toolbarw - windowW, headerh)) {
var scene = iron.Scene.active;
var cam = scene.cameras[0];
@@ -1115,6 +1119,14 @@ class UITrait extends iron.Trait {
ViewportUtil.scaleToBounds();
}
ui.t.FILL_BUTTON_BG = true;
if (messageTimer > 0) {
var _w = ui._w;
ui._w = Std.int(ui.ops.font.width(ui.fontSize, message) + 50 * ui.SCALE);
ui.fill(0, 0, ui._w, ui._h, 0xffff0000);
ui.text(message);
ui._w = _w;
}
}
var wx = C.ui_layout == 0 ? arm.App.realw() - windowW : 0;
@@ -1358,10 +1370,6 @@ class UITrait extends iron.Trait {
if (ui.tab(htab, "Tools")) {
if (messageTimer > 0) {
ui.text(message);
}
if (ui.panel(Id.handle({selected: true}), "Brushes", 1)) {
ui.row([1/2,1/2]);
if (ui.button("New")) {}