diff --git a/core/assets-raw/fontgen/config.json b/core/assets-raw/fontgen/config.json index d9fd5accf9..614df2a56c 100644 --- a/core/assets-raw/fontgen/config.json +++ b/core/assets-raw/fontgen/config.json @@ -1083,6 +1083,126 @@ "search": [ "arrow-note" ] + }, + { + "uid": "9ea0a737ccc45d6c510dcbae56058849", + "css": "music", + "code": 59402, + "src": "fontawesome" + }, + { + "uid": "81db033e704eb7c586a365559d7c0f36", + "css": "file-audio", + "code": 61895, + "src": "fontawesome" + }, + { + "uid": "e44601720c64e6bb6a2d5cba6b0c588c", + "css": "volume-off", + "code": 59404, + "src": "fontawesome" + }, + { + "uid": "fee6e00f36e8ca8ef3e4a62caa213bf6", + "css": "volume-down", + "code": 59423, + "src": "fontawesome" + }, + { + "uid": "76857a03fbaa6857fe063b6c25aa98ed", + "css": "volume-up", + "code": 59424, + "src": "fontawesome" + }, + { + "uid": "3db5347bd219f3bce6025780f5d9ef45", + "css": "tag", + "code": 59425, + "src": "fontawesome" + }, + { + "uid": "a3f89e106175a5c5c4e9738870b12e55", + "css": "tags", + "code": 59432, + "src": "fontawesome" + }, + { + "uid": "69bd9dfe950d07d910f39c6988364e49", + "css": "battery-4", + "code": 62016, + "src": "fontawesome" + }, + { + "uid": "7ab4ec24078133effbc4e923b65ef835", + "css": "battery-3", + "code": 62017, + "src": "fontawesome" + }, + { + "uid": "e430a168b45ba40aa988ca1a5034a553", + "css": "battery-2", + "code": 62018, + "src": "fontawesome" + }, + { + "uid": "99f4ea74adc24022106932d84a49b055", + "css": "battery-1", + "code": 62019, + "src": "fontawesome" + }, + { + "uid": "9983d2489e028d659d196915a25ef3ca", + "css": "battery-0", + "code": 62020, + "src": "fontawesome" + }, + { + "uid": "26613a2e6bc41593c54bead46f8c8ee3", + "css": "file-code", + "code": 61897, + "src": "fontawesome" + }, + { + "uid": "dd69d9aa589ea7bc0a82a3fe67039f4b", + "css": "file-video", + "code": 61896, + "src": "fontawesome" + }, + { + "uid": "e80ae555c1413a4ec18b33fb348b4049", + "css": "file-archive", + "code": 61894, + "src": "fontawesome" + }, + { + "uid": "c95735c17a10af81448c7fed98a04546", + "css": "folder-open", + "code": 59438, + "src": "fontawesome" + }, + { + "uid": "b091a8bd0fdade174951f17d936f51e4", + "css": "folder-empty", + "code": 61716, + "src": "fontawesome" + }, + { + "uid": "6533bdc16ab201eb3f3b27ce989cab33", + "css": "folder-open-empty", + "code": 61717, + "src": "fontawesome" + }, + { + "uid": "c7a75a25880928fe76981a53eca4f926", + "css": "inbox", + "code": 59439, + "src": "fontawesome" + }, + { + "uid": "6fe95ffc3c807e62647d4f814a96e0d7", + "css": "sitemap", + "code": 61672, + "src": "fontawesome" } ] } \ No newline at end of file diff --git a/core/assets/fonts/font.woff b/core/assets/fonts/font.woff index 092f2f1f6b..2a04426c75 100644 Binary files a/core/assets/fonts/font.woff and b/core/assets/fonts/font.woff differ diff --git a/core/assets/fonts/icon.ttf b/core/assets/fonts/icon.ttf index 0abe794e1c..36a0681abf 100644 Binary files a/core/assets/fonts/icon.ttf and b/core/assets/fonts/icon.ttf differ diff --git a/core/src/mindustry/editor/MapPatchesDialog.java b/core/src/mindustry/editor/MapPatchesDialog.java index a977d87c26..38c1a38eca 100644 --- a/core/src/mindustry/editor/MapPatchesDialog.java +++ b/core/src/mindustry/editor/MapPatchesDialog.java @@ -21,11 +21,11 @@ public class MapPatchesDialog extends BaseDialog{ private DataAssetType currentType = DataAssetType.music; private TextureRegionDrawable[] typeIcons = { - Icon.file, + Icon.fileCode, Icon.box, Icon.image, - Icon.info, - Icon.infoCircle, + Icon.volumeUp, + Icon.music, Icon.fileText }; @@ -35,6 +35,7 @@ public class MapPatchesDialog extends BaseDialog{ shown(this::setup); addCloseButton(); + getCell(cont).grow(); //buttons.button("@editor.patches.guide", Icon.link, () -> Core.app.openURI(patchesGuideURL)).size(190f, 64f); //buttons.button("@editor.images", Icon.image, () -> images.show()).size(190f, 64f); @@ -46,16 +47,14 @@ public class MapPatchesDialog extends BaseDialog{ types.button(typeIcons[type.ordinal()], Styles.squareTogglei, () -> { currentType = type; setup(); - }).checked(b -> currentType == type).tooltip(type.name()).size(50f).pad(4f).row(); + }).checked(b -> currentType == type).tooltip(type.name()).size(50f).pad(4f); } cont.top().left(); - cont.add(types).growY(); + cont.add(types).left().row(); - getCell(cont).grow(); - - cont.pane(t -> list = t); + cont.pane(t -> list = t).grow().top(); } private void setup(){