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

Add basic UI to view saved servers

Browse Source 
Former-commit-id: 85cc946ac3684aaba64a03997790ef5ab06dbbd7
This commit is contained in:
Louis Pearson 2019-04-19 05:14:05 -06:00
parent 15c2cdb2ef
commit d7c80d0afc
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/menu/main/mod.rs
View File

@ -85,7 +85,7 @@ impl PlayState for MainMenuState {
// Maintain the UI
for event in self
.main_menu_ui
.maintain(global_state.window.renderer_mut())
.maintain(global_state)
{
match event {
MainMenuEvent::LoginAttempt {

53
voxygen/src/menu/main/ui.rs
View File

@ -38,8 +38,12 @@ widget_ids! {
username_field,
singleplayer_button,
singleplayer_text,
// Buttons
// Serverlist
servers_button,
servers_frame,
servers_text,
servers_close,
// Buttons
settings_button,
quit_button,
// Error
@ -135,6 +139,7 @@ pub struct MainMenuUi {
server_address: String,
login_error: Option<String>,
connecting: Option<std::time::Instant>,
show_servers: bool,
}
impl MainMenuUi {
@ -169,10 +174,11 @@ impl MainMenuUi {
server_address,
login_error: None,
connecting: None,
show_servers: false,
}
}
fn update_layout(&mut self) -> Vec<Event> {
fn update_layout(&mut self, global_state: &GlobalState) -> Vec<Event> {
let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("CARGO_PKG_VERSION");
@ -276,6 +282,39 @@ impl MainMenuUi {
self.login_error = None
};
}
if self.show_servers {
Image::new(self.imgs.error_frame)
.top_left_with_margins_on(ui_widgets.window, 3.0, 3.0)
.w_h(400.0, 100.0)
.set(self.ids.servers_frame, ui_widgets);
let text = global_state.settings.networking.servers.iter()
.fold("".to_string(), |mut acc, x| {
acc.push_str(&x);
acc.push_str("\n");
acc
});
Text::new(&text)
.color(TEXT_COLOR)
.top_left_with_margins_on(self.ids.servers_frame, 20.0, 20.0)
.font_id(self.font_opensans)
.font_size(18)
.set(self.ids.servers_text, ui_widgets);
if Button::image(self.imgs.button_dark)
.w_h(100.0, 30.0)
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0)
.hover_image(self.imgs.button_dark_hover)
.press_image(self.imgs.button_dark_press)
.label_y(Relative::Scalar(2.0))
.label("Close")
.label_font_size(10)
.label_color(TEXT_COLOR)
.set(self.ids.servers_close, ui_widgets)
.was_clicked()
{
self.show_servers = false
};
}
// Server address
Image::new(self.imgs.input_bg)
.w_h(337.0, 67.0)
@ -396,7 +435,9 @@ impl MainMenuUi {
.label_y(Relative::Scalar(3.0))
.set(self.ids.servers_button, ui_widgets)
.was_clicked()
{};
{
self.show_servers = true;
};
events
}
@ -414,9 +455,9 @@ impl MainMenuUi {
self.ui.handle_event(event);
}
pub fn maintain(&mut self, renderer: &mut Renderer) -> Vec<Event> {
let events = self.update_layout();
self.ui.maintain(renderer);
pub fn maintain(&mut self, global_state: &mut GlobalState) -> Vec<Event> {
let events = self.update_layout(global_state);
self.ui.maintain(global_state.window.renderer_mut());
events
}