diff --git a/src/Decentralized/TerminalWindow.cs b/src/Decentralized/TerminalWindow.cs index ceeed7e..d947b7c 100644 --- a/src/Decentralized/TerminalWindow.cs +++ b/src/Decentralized/TerminalWindow.cs @@ -1001,8 +1001,10 @@ namespace Decentralized var d = Session.Data; b.AddLabel(L.T("wallets.count", d.Wallets.Count, Tuning.WalletMax), "wallets_count_dim"); bool wide = L.Wide && Ext < 100f; - float k = Ext < 100f ? 1f : (ScreenW - 28f) / 740f; - var cols = (wide ? new[] { 100f, 92f, 62f, 62f, 372f } : Ext < 100f ? new[] { 100f, 110f, 85f, 70f, 375f } : new[] { 140f, 100f, 85f, 95f, 320f }).Select(x => x * k).ToArray(); + float k = Ext < 100f ? 1f : (ScreenW - 70f) / 740f; + bool big = Ext >= 100f; + float btnCut = wide ? 112f : big ? 78f : 150f, statW = wide ? 92f : big ? 70f : 84f; + var cols = (wide ? new[] { 100f, 92f, 62f, 62f, 372f } : Ext < 100f ? new[] { 100f, 110f, 85f, 70f, 375f } : new[] { 165f, 100f, 70f, 115f, 290f }).Select(x => x * k).ToArray(); var aligns = new[] { TextAnchor.MiddleLeft, TextAnchor.MiddleLeft, TextAnchor.MiddleRight, TextAnchor.MiddleRight, TextAnchor.MiddleLeft }; TableHeader(b, 740f * k, cols, aligns, L.T("wallets.col.name"), L.T("wallets.col.addr"), L.T("col.value"), L.T("wallets.col.taint"), ""); for (int i = 0; i < d.Wallets.Count; i++) @@ -1027,7 +1029,7 @@ namespace Decentralized Cell(b, cols[3], Fmt.Credits(w.Taint), false, TextAnchor.MiddleRight); b.End(); b.End(); - b.BeginPanel(cols[4] - (wide ? 112f : 150f) * k, 32f * F, TextAnchor.MiddleLeft, 0f, 0f); + b.BeginPanel(cols[4] - btnCut * k, 32f * F, TextAnchor.MiddleLeft, 0f, 0f); _clear.Add(b.Last.image); b.BeginRow(4f, TextAnchor.MiddleLeft); RowKey(b, L.T("wallets.open"), () => WalletWindow.Open(w)); @@ -1036,7 +1038,7 @@ namespace Decentralized if (idx > 0) RowKey(b, _destroyPick == w.Address ? L.T("wallets.destroy.sure") : L.T("wallets.destroy"), () => DestroyWallet(w)); b.End(); b.End(); - b.BeginPanel((wide ? 92f : 84f) * k, 32f * F, TextAnchor.MiddleRight, 0f, 0f); + b.BeginPanel(statW * k, 32f * F, TextAnchor.MiddleRight, 0f, 0f); _clear.Add(b.Last.image); b.BeginRow(0f, TextAnchor.MiddleRight); if (idx != d.Current) RowKey(b, L.T("wallets.use"), () => { d.Current = idx; Session.Save(); Open(); });