zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glfw: better handle Wayland limitations

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2021-07-23 14:05:54 -07:00
parent 8ccae4cb1a
commit a690b84732
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
glfw/src/Monitor.zig
View file

@ -529,7 +529,10 @@ test "set_getGammaRamp" {
const monitor = try getPrimary(); const monitor = try getPrimary();
if (monitor) |m| { if (monitor) |m| {
const ramp = try m.getGammaRamp(); const ramp = m.getGammaRamp() catch |err| {
std.debug.print("can't get window position, wayland maybe? error={}\n", .{err});
return;
};
// Set it to the exact same value; if we do otherwise an our tests fail it wouldn't call // Set it to the exact same value; if we do otherwise an our tests fail it wouldn't call
// terminate and our made-up gamma ramp would get stuck. // terminate and our made-up gamma ramp would get stuck.

5
glfw/src/Window.zig
View file

@ -447,7 +447,8 @@ test "setIcon" {
icon.pixels[(x * y * 4) + 3] = 255; // alpha icon.pixels[(x * y * 4) + 3] = 255; // alpha
} }
} }
try window.setIcon(allocator, &[_]Image{icon}); window.setIcon(allocator, &[_]Image{icon}) catch |err| std.debug.print("can't set window icon, wayland maybe? error={}\n", .{err});
icon.deinit(allocator); // glfw copies it. icon.deinit(allocator); // glfw copies it.
} }
@ -464,5 +465,5 @@ test "getPos" {
}; };
defer window.destroy(); defer window.destroy();
_ = try window.getPos(); _ = window.getPos() catch |err| std.debug.print("can't get window position, wayland maybe? error={}\n", .{err});
} }