Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cache-video-modes' into 'master'

Browse Source 
Caching video modes fixes #729

Closes #729

See merge request veloren/veloren!1670
This commit is contained in:
Imbris 2021-01-02 06:43:34 +00:00
commit 17be17834e
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
voxygen/src/hud/settings_window.rs
View File

@ -265,6 +265,8 @@ impl<'a> SettingsWindow<'a> {
pub struct State {
ids: Ids,
// Resolution, Bit Depth and Refresh Rate
video_modes: Vec<VideoMode>,
}
pub enum Event {
@ -327,8 +329,18 @@ impl<'a> Widget for SettingsWindow<'a> {
type Style = ();
fn init_state(&self, id_gen: widget::id::Generator) -> Self::State {
let video_modes = self
.global_state
.window
.window()
.current_monitor()
.unwrap()
.video_modes()
.collect();
State {
ids: Ids::new(id_gen),
video_modes,
}
}
@ -2401,18 +2413,9 @@ impl<'a> Widget for SettingsWindow<'a> {
events.push(Event::ToggleParticlesEnabled(particles_enabled));
}
// Resolution, Bit Depth and Refresh Rate
let video_modes: Vec<VideoMode> = self
.global_state
.window
.window()
.current_monitor()
.unwrap()
.video_modes()
.collect();
// Resolution
let resolutions: Vec<[u16; 2]> = video_modes
let resolutions: Vec<[u16; 2]> = state
.video_modes
.iter()
.sorted_by_key(|mode| mode.size().height)
.sorted_by_key(|mode| mode.size().width)
@ -2451,8 +2454,9 @@ impl<'a> Widget for SettingsWindow<'a> {
}
// Bit Depth and Refresh Rate
let correct_res: Vec<VideoMode> = video_modes
.into_iter()
let correct_res: Vec<&VideoMode> = state
.video_modes
.iter()
.filter(|mode| {
mode.size().width
== self.global_state.settings.graphics.fullscreen.resolution[0] as u32