Skip to content
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

Jump to bottom

Clean up the display modes parsing #1844

Merged
merged 2 commits into from
Nov 5, 2022
Merged

Clean up the display modes parsing #1844

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42c4466
Clean up the display modes parsing
tonihele Aug 17, 2022
f6ccb8e
No need to separately test for the contains
tonihele Aug 17, 2022
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
81 changes: 39 additions & 42 deletions jme3-desktop/src/main/java/com/jme3/app/SettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.prefs.BackingStoreException;
Expand Down Expand Up @@ -743,10 +745,10 @@ private String[] getResolutions(DisplayMode[] modes, int heightLimit, int widthL
heightLimit -= insets.top + insets.bottom;
widthLimit -= insets.left + insets.right;

ArrayList<String> resolutions = new ArrayList<>(modes.length);
for (int i = 0; i < modes.length; i++) {
int height = modes[i].getHeight();
int width = modes[i].getWidth();
Set<String> resolutions = new LinkedHashSet<>(modes.length);
for (DisplayMode mode : modes) {
int height = mode.getHeight();
int width = mode.getWidth();
if (width >= minWidth && height >= minHeight) {
if (height >= heightLimit) {
height = heightLimit;
Expand All @@ -756,15 +758,11 @@ private String[] getResolutions(DisplayMode[] modes, int heightLimit, int widthL
}

String res = width + " x " + height;
if (!resolutions.contains(res)) {
resolutions.add(res);
}
resolutions.add(res);
}
}

String[] res = new String[resolutions.size()];
resolutions.toArray(res);
return res;
return resolutions.toArray(new String[0]);
}

/**
Expand All @@ -776,12 +774,12 @@ private String[] getWindowedResolutions(DisplayMode[] modes) {
int maxHeight = 0;
int maxWidth = 0;

for (int i = 0; i < modes.length; i++) {
if (maxHeight < modes[i].getHeight()) {
maxHeight = modes[i].getHeight();
for (DisplayMode mode : modes) {
if (maxHeight < mode.getHeight()) {
maxHeight = mode.getHeight();
}
if (maxWidth < modes[i].getWidth()) {
maxWidth = modes[i].getWidth();
if (maxWidth < mode.getWidth()) {
maxWidth = mode.getWidth();
}
}

Expand All @@ -792,56 +790,56 @@ private String[] getWindowedResolutions(DisplayMode[] modes) {
* Returns every possible bit depth for the given resolution.
*/
private static String[] getDepths(String resolution, DisplayMode[] modes) {
ArrayList<String> depths = new ArrayList<>(4);
for (int i = 0; i < modes.length; i++) {
List<String> depths = new ArrayList<>(4);
for (DisplayMode mode : modes) {
int bitDepth = mode.getBitDepth();
if (bitDepth == DisplayMode.BIT_DEPTH_MULTI) {
continue;
}
// Filter out all bit depths lower than 16 - Java incorrectly
// reports
// them as valid depths though the monitor does not support them
if (modes[i].getBitDepth() < 16 && modes[i].getBitDepth() > 0) {
if (bitDepth < 16 && bitDepth > 0) {
continue;
}

String res = modes[i].getWidth() + " x " + modes[i].getHeight();
String depth = modes[i].getBitDepth() + " bpp";
if (res.equals(resolution) && !depths.contains(depth)) {
String res = mode.getWidth() + " x " + mode.getHeight();
if (!res.equals(resolution)) {
continue;
}
String depth = bitDepth + " bpp";
if (!depths.contains(depth)) {
depths.add(depth);
}
}

if (depths.size() == 1 && depths.contains("-1 bpp")) {
if (depths.isEmpty()) {
// add some default depths, possible system is multi-depth supporting
depths.clear();
depths.add("24 bpp");
}

String[] res = new String[depths.size()];
depths.toArray(res);
return res;
return depths.toArray(new String[0]);
}

/**
* Returns every possible refresh rate for the given resolution.
*/
private static String[] getFrequencies(String resolution,
DisplayMode[] modes) {
ArrayList<String> freqs = new ArrayList<>(4);
for (int i = 0; i < modes.length; i++) {
String res = modes[i].getWidth() + " x " + modes[i].getHeight();
List<String> freqs = new ArrayList<>(4);
for (DisplayMode mode : modes) {
String res = mode.getWidth() + " x " + mode.getHeight();
String freq;
if (modes[i].getRefreshRate() == DisplayMode.REFRESH_RATE_UNKNOWN) {
if (mode.getRefreshRate() == DisplayMode.REFRESH_RATE_UNKNOWN) {
freq = "???";
} else {
freq = modes[i].getRefreshRate() + " Hz";
freq = mode.getRefreshRate() + " Hz";
}

if (res.equals(resolution) && !freqs.contains(freq)) {
freqs.add(freq);
}
}

String[] res = new String[freqs.size()];
freqs.toArray(res);
return res;
return freqs.toArray(new String[0]);
}

/**
Expand All @@ -854,13 +852,12 @@ private static String[] getFrequencies(String resolution,
private static String getBestFrequency(String resolution, DisplayMode[] modes) {
int closest = Integer.MAX_VALUE;
int desired = 60;
for (int i = 0; i < modes.length; i++) {
String res = modes[i].getWidth() + " x " + modes[i].getHeight();
int freq = modes[i].getRefreshRate();
for (DisplayMode mode : modes) {
String res = mode.getWidth() + " x " + mode.getHeight();
int freq = mode.getRefreshRate();
if (freq != DisplayMode.REFRESH_RATE_UNKNOWN && res.equals(resolution)) {
if (Math.abs(freq - desired) <
Math.abs(closest - desired)) {
closest = modes[i].getRefreshRate();
if (Math.abs(freq - desired) < Math.abs(closest - desired)) {
closest = mode.getRefreshRate();
}
}
}
Expand Down