AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-08-03 11:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some text, add default_background

Browse Source
This commit is contained in:
Carrie 2024-07-23 11:44:34 -06:00 committed by IntegratedQuantum
parent 952d93c45e
commit 67cce6f25a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/backgrounds/default_background.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 MiB

2
src/gui/windows/pause.zig
View File

@ -32,7 +32,7 @@ pub fn onOpen() void {
} }
list.add(Button.initText(.{0, 0}, 128, "Settings", gui.openWindowCallback("settings"))); list.add(Button.initText(.{0, 0}, 128, "Settings", gui.openWindowCallback("settings")));
list.add(Button.initText(.{0, 0}, 128, "Reorder HUD", .{.callback = &reorderHudCallbackFunction})); list.add(Button.initText(.{0, 0}, 128, "Reorder HUD", .{.callback = &reorderHudCallbackFunction}));
list.add(Button.initText(.{0, 0}, 128, "Exit to Menu TODO", .{ list.add(Button.initText(.{0, 0}, 128, "Exit World", .{
.callback = &exitMenuCallbackFunction, .callback = &exitMenuCallbackFunction,
})); }));
list.finish(.center); list.finish(.center);

8
src/gui/windows/save_selection.zig
View File

@ -137,8 +137,8 @@ pub fn update() void {
pub fn onOpen() void { pub fn onOpen() void {
buttonNameArena = main.utils.NeverFailingArenaAllocator.init(main.globalAllocator); buttonNameArena = main.utils.NeverFailingArenaAllocator.init(main.globalAllocator);
const list = VerticalList.init(.{padding, 16 + padding}, 300, 8); const list = VerticalList.init(.{padding, 16 + padding}, 300, 8);
list.add(Button.initText(.{0, 0}, 128, "Create World", gui.openWindowCallback("save_creation"))); list.add(Label.init(.{0, 0}, width, "**Select World**", .center));
list.add(Button.initText(.{0, 0}, 128, "Create New World", gui.openWindowCallback("save_creation")));
readingSaves: { readingSaves: {
var dir = std.fs.cwd().makeOpenPath("saves", .{.iterate = true}) catch |err| { var dir = std.fs.cwd().makeOpenPath("saves", .{.iterate = true}) catch |err| {
list.add(Label.init(.{0, 0}, 128, "Encountered error while trying to open saves folder:", .center)); list.add(Label.init(.{0, 0}, 128, "Encountered error while trying to open saves folder:", .center));
@ -159,7 +159,7 @@ pub fn onOpen() void {
const decodedName = parseEscapedFolderName(main.stackAllocator, entry.name); const decodedName = parseEscapedFolderName(main.stackAllocator, entry.name);
defer main.stackAllocator.free(decodedName); defer main.stackAllocator.free(decodedName);
const name = buttonNameArena.allocator().dupeZ(u8, entry.name); // Null terminate, so we can later recover the string from just the pointer. const name = buttonNameArena.allocator().dupeZ(u8, entry.name); // Null terminate, so we can later recover the string from just the pointer.
const buttonName = std.fmt.allocPrint(buttonNameArena.allocator().allocator, "Play {s}", .{decodedName}) catch unreachable; const buttonName = std.fmt.allocPrint(buttonNameArena.allocator().allocator, "{s}", .{decodedName}) catch unreachable;
row.add(Button.initText(.{0, 0}, 128, buttonName, .{.callback = &openWorldWrap, .arg = @intFromPtr(name.ptr)})); row.add(Button.initText(.{0, 0}, 128, buttonName, .{.callback = &openWorldWrap, .arg = @intFromPtr(name.ptr)}));
row.add(Button.initIcon(.{8, 0}, .{16, 16}, fileExplorerIcon, false, .{.callback = &openFolder, .arg = @intFromPtr(name.ptr)})); row.add(Button.initIcon(.{8, 0}, .{16, 16}, fileExplorerIcon, false, .{.callback = &openFolder, .arg = @intFromPtr(name.ptr)}));
@ -169,7 +169,7 @@ pub fn onOpen() void {
} }
} }
} }
list.finish(.center); list.finish(.center);
window.rootComponent = list.toComponent(); window.rootComponent = list.toComponent();
window.contentSize = window.rootComponent.?.pos() + window.rootComponent.?.size() + @as(Vec2f, @splat(padding)); window.contentSize = window.rootComponent.?.pos() + window.rootComponent.?.size() + @as(Vec2f, @splat(padding));