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

Use global_state for accessing settings in hud

Browse Source 
This has led to a performance regression. For some reason when the menu opens
FPS drops to about 20.


Former-commit-id: 84cdbec5ef40cf6189e544eba6b87981bb9514fe
This commit is contained in:
Louis Pearson 2019-05-20 22:51:29 -06:00
parent 9f1c70792f
commit 4dfebb779e
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use crate::{
ImageSlider, ScaleMode, ToggleButton, Ui,
},
window::Window,
GlobalState,
AudioFrontend, GlobalState,
};
use conrod_core::{
color,
@ -562,6 +562,8 @@ impl<'a> Widget for SettingsWindow<'a> {
}
// Audio Device Selector --------------------------------------------
let device = self.global_state.audio.get_device();
let device_list = AudioFrontend::get_devices();
Text::new("Volume")
.down_from(state.ids.audio_volume_slider, 10.0)
.font_size(14)
@ -570,22 +572,15 @@ impl<'a> Widget for SettingsWindow<'a> {
.set(state.ids.audio_device_text, ui);
// Get which device is currently selected
let selected = self
.global_state
.settings
.audio
.audio_devices
.iter()
.position(|x| x.contains(&self.global_state.settings.audio.audio_device));
let selected = device_list.iter().position(|x| x.contains(&device));
if let Some(clicked) =
DropDownList::new(&self.global_state.settings.audio.audio_devices, selected)
.w_h(400.0, 22.0)
.down_from(state.ids.audio_device_text, 10.0)
.label_font_id(self.fonts.opensans)
.set(state.ids.audio_device_list, ui)
if let Some(clicked) = DropDownList::new(&device_list, selected)
.w_h(400.0, 22.0)
.down_from(state.ids.audio_device_text, 10.0)
.label_font_id(self.fonts.opensans)
.set(state.ids.audio_device_list, ui)
{
let new_val = self.global_state.settings.audio.audio_devices[clicked].clone();
let new_val = device_list[clicked].clone();
events.push(Event::ChangeAudioDevice(new_val));
}
}

2
voxygen/src/session.rs
View File

@ -177,7 +177,7 @@ impl PlayState for SessionState {
);
// Maintain the UI.
for event in self.hud.maintain(&mut global_state, clock.get_tps()) {
for event in self.hud.maintain(global_state, clock.get_tps()) {
match event {
HudEvent::SendMessage(msg) => {
// TODO: Handle result