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

Align text

Browse Source
This commit is contained in:
luboslenco
2019-03-08 09:02:58 +01:00
parent 3f7e2b1cb9
commit def76b69b3
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/App.hx
+4 -4
View File
@@ -482,7 +482,7 @@ class App extends iron.Trait {
var date = Macro.buildDate().split(" ")[0];
var dateInt = Std.parseInt(StringTools.replace(date, "-", ""));
if (updateVersion > dateInt) {
arm.App.showMessageBox("Update is available!");
arm.App.showMessageBox("Update is available!\nPlease visit armorpaint.org to download.");
}
else {
arm.App.showMessageBox("You are up to date!");
@@ -493,11 +493,11 @@ class App extends iron.Trait {
}
if (ui.button("About...", Left)) {
var sha = Macro.buildSha();
sha = sha.substr(1, sha.length - 2);
var date = Macro.buildDate().split(" ")[0];
var gapi = #if (kha_direct3d11) "Direct3D11" #else "OpenGL" #end;
var renderer = #if (rp_renderer == "Deferred") "Deferred" #else "Forward" #end;
var msg = "ArmorPaint.org - v" + version + " (" + date + ") - " + sha + "\n";
msg += kha.System.systemId + " - " + gapi + " - " + renderer;
var msg = "ArmorPaint.org - v" + version + " (" + date + ") - git " + sha + "\n";
msg += kha.System.systemId + " - " + gapi;
arm.App.showMessageBox(msg);
}
}
Sources/arm/util/RenderUtil.hx
+15 -4
View File
@@ -131,15 +131,26 @@ class RenderUtil {
@:access(zui.Zui)
public static function makeTextPreview() {
var text = UITrait.inst.textToolText;
var font = UITrait.inst.getTextToolFont();
var fontSize = 200;
var textW = Std.int(font.width(fontSize, text));
var textH = Std.int(font.height(fontSize));
var texW = textW + 32;
if (texW < 512) texW = 512;
if (UITrait.inst.textToolImage != null && UITrait.inst.textToolImage.width < texW) {
UITrait.inst.textToolImage.unload();
UITrait.inst.textToolImage = null;
}
if (UITrait.inst.textToolImage == null) {
UITrait.inst.textToolImage = kha.Image.createRenderTarget(512, 512, kha.graphics4.TextureFormat.L8);
UITrait.inst.textToolImage = kha.Image.createRenderTarget(texW, texW, kha.graphics4.TextureFormat.L8);
}
var g2 = UITrait.inst.textToolImage.g2;
g2.begin(true, 0xff000000);
g2.font = UITrait.inst.getTextToolFont();
g2.fontSize = 200;
g2.font = font;
g2.fontSize = fontSize;
g2.color = 0xffffffff;
g2.drawString(UITrait.inst.textToolText, 0, 0);
g2.drawString(text, texW / 2 - textW / 2, texW / 2 - textH / 2);
g2.end();
}
}