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 clickable server buttons

Browse Source 
Former-commit-id: d56b65b83db590991a2a42a95caa7b41a216052c
This commit is contained in:
Louis Pearson
2019-04-19 09:27:37 -06:00
parent d7c80d0afc
commit dadbfb9d85
1 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ use conrod_core::{
image::Id as ImgId, image::Id as ImgId,
position::{Dimension, Relative}, position::{Dimension, Relative},
text::font::Id as FontId, text::font::Id as FontId,
widget::{text_box::Event as TextBoxEvent, Button, Image, Rectangle, Text, TextBox}, widget::{text_box::Event as TextBoxEvent, Button, Image, Rectangle, Text, TextBox, List},
widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, Widget, widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, Widget,
}; };
@ -285,21 +285,41 @@ impl MainMenuUi {
if self.show_servers { if self.show_servers {
Image::new(self.imgs.error_frame) Image::new(self.imgs.error_frame)
.top_left_with_margins_on(ui_widgets.window, 3.0, 3.0) .top_left_with_margins_on(ui_widgets.window, 3.0, 3.0)
.w_h(400.0, 100.0) .w_h(400.0, 300.0)
.set(self.ids.servers_frame, ui_widgets); .set(self.ids.servers_frame, ui_widgets);
let text = global_state.settings.networking.servers.iter()
.fold("".to_string(), |mut acc, x| { let netsettings = &global_state.settings.networking;
acc.push_str(&x);
acc.push_str("\n"); let (mut items, scrollbar) = List::flow_down(netsettings.servers.len())
acc .top_left_with_margins_on(self.ids.servers_frame, 0.0, 5.0)
}); .w_h(400.0, 300.0)
Text::new(&text) .scrollbar_next_to()
.color(TEXT_COLOR) .scrollbar_thickness(18.0)
.top_left_with_margins_on(self.ids.servers_frame, 20.0, 20.0) .scrollbar_color(TEXT_COLOR)
.font_id(self.font_opensans)
.font_size(18)
.set(self.ids.servers_text, ui_widgets); .set(self.ids.servers_text, ui_widgets);
while let Some(item) = items.next(ui_widgets) {
let mut text = "".to_string();
if &netsettings.servers[item.i] == &self.server_address {text.push_str("* ")}
else {text.push_str(" ")}
text.push_str(&netsettings.servers[item.i]);
if item.set(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(&text)
.label_font_size(10)
.label_color(TEXT_COLOR),
ui_widgets
).was_clicked() {
// TODO: Set as current server address
self.server_address = netsettings.servers[item.i].clone();
}
}
if Button::image(self.imgs.button_dark) if Button::image(self.imgs.button_dark)
.w_h(100.0, 30.0) .w_h(100.0, 30.0)
.mid_bottom_with_margin_on(self.ids.servers_frame, 5.0) .mid_bottom_with_margin_on(self.ids.servers_frame, 5.0)