Skip to content

Fix Resolution Slider Value Exception #3294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix Resolution Slider Value Exception #3294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/src/main/java/net/caffeinemc/mods/sodium/client/gui/SodiumGameOptionPages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@ public static OptionPage general() {
.add(OptionImpl.createBuilder(int.class, vanillaOpts)
.setName(Component.translatable("options.fullscreen.resolution"))
.setTooltip(Component.translatable("sodium.options.fullscreen_resolution.tooltip"))
.setControl(option -> new SliderControl(option, 0, null != monitor? monitor.getModeCount(): 0, 1, ControlValueFormatter.resolution()))
// the max value of 1 when the monitor is not available prevents an exception from being thrown
.setControl(option -> new SliderControl(option, 0, null != monitor ? monitor.getModeCount() : 1, 1, ControlValueFormatter.resolution()))
.setBinding((options, value) -> {
if (null != monitor) {
window.setPreferredFullscreenVideoMode(0 == value? Optional.empty(): Optional.of(monitor.getMode(value - 1)));
window.setPreferredFullscreenVideoMode(0 == value ? Optional.empty() : Optional.of(monitor.getMode(value - 1)));
}
}, options -> {
if (null == monitor) {
return 0;
}
else {
} else {
Optional<VideoMode> optional = window.getPreferredFullscreenVideoMode();
return optional.map((videoMode) -> monitor.getVideoModeIndex(videoMode) + 1).orElse(0);
}
})
.setEnabled(() -> OsUtils.getOs() == OsUtils.OperatingSystem.WIN && Minecraft.getInstance().getWindow().findBestMonitor() != null)
.setEnabled(() -> monitor != null && monitor.getModeCount() > 0 && OsUtils.getOs() == OsUtils.OperatingSystem.WIN)
.setFlags(OptionFlag.REQUIRES_VIDEOMODE_RELOAD)
.build())
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/net/caffeinemc/mods/sodium/client/gui/options/control/ControlValueFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ static ControlValueFormatter resolution() {
return (v) -> {
Monitor monitor = Minecraft.getInstance().getWindow().findBestMonitor();

if (OsUtils.getOs() != OsUtils.OperatingSystem.WIN || monitor == null) {
if (monitor == null || OsUtils.getOs() != OsUtils.OperatingSystem.WIN) {
return Component.translatable("options.fullscreen.unavailable");
} else if (0 == v) {
return Component.translatable("options.fullscreen.current");
Expand Down