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 'login_desc' into 'master'

Browse Source 
Login desc

See merge request veloren/veloren!647
This commit is contained in:
Acrimon 2019-11-09 23:19:41 +00:00
commit 5fe1eecf1f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,11 +191,8 @@ impl MainMenuUi {
); );
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0); const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
const TEXT_COLOR_2: Color = Color::Rgba(1.0, 1.0, 1.0, 0.2); const TEXT_COLOR_2: Color = Color::Rgba(1.0, 1.0, 1.0, 0.2);
//const INACTIVE: Color = Color::Rgba(0.47, 0.47, 0.47, 0.47);
let intro_text: &'static str = "Information on the Login Process:\n\ let intro_text: &'static str = "Information on the Login Process:\n\
\n\
Choose whatever Username and Password you want.\n\
(The middle box is for Password input)\n\
They will be saved until server restart.\n\
\n\ \n\
The name you put in will be your character name ingame.\n\ The name you put in will be your character name ingame.\n\
\n\ \n\
@ -331,7 +328,7 @@ impl MainMenuUi {
}; };
} }
// Info Window // Info Window
Rectangle::fill_with([550.0, 280.0], color::BLACK) Rectangle::fill_with([550.0, 200.0], color::BLACK)
.top_left_with_margins_on(ui_widgets.window, 40.0, 40.0) .top_left_with_margins_on(ui_widgets.window, 40.0, 40.0)
.color(Color::Rgba(0.0, 0.0, 0.0, 0.95)) .color(Color::Rgba(0.0, 0.0, 0.0, 0.95))
.set(self.ids.info_frame, ui_widgets); .set(self.ids.info_frame, ui_widgets);
@ -392,12 +389,14 @@ impl MainMenuUi {
} }
} }
// Password // Password
Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) // TODO: REACTIVATE THIS WHEN A PROPER ACCOUNT SYSTEM IS IN PLACE
/*Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
.down_from(self.ids.usrnm_bg, 30.0) .down_from(self.ids.usrnm_bg, 30.0)
.set(self.ids.passwd_bg, ui_widgets); .set(self.ids.passwd_bg, ui_widgets);
Image::new(self.imgs.input_bg) Image::new(self.imgs.input_bg)
.w_h(337.0, 67.0) .w_h(337.0, 67.0)
.middle_of(self.ids.passwd_bg) .middle_of(self.ids.passwd_bg)
.color(Some(INACTIVE))
.set(self.ids.password_bg, ui_widgets); .set(self.ids.password_bg, ui_widgets);
for event in TextBox::new(&self.password) for event in TextBox::new(&self.password)
.w_h(290.0, 30.0) .w_h(290.0, 30.0)
@ -419,7 +418,7 @@ impl MainMenuUi {
login!(); login!();
} }
} }
} }*/
// Popup (Error/Info) // Popup (Error/Info)
if let Some(popup_data) = &self.popup { if let Some(popup_data) = &self.popup {
let text = Text::new(&popup_data.msg) let text = Text::new(&popup_data.msg)
@ -524,7 +523,7 @@ impl MainMenuUi {
} }
// Server address // Server address
Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97)) Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
.down_from(self.ids.passwd_bg, 30.0) .down_from(self.ids.usrnm_bg, 30.0)
.set(self.ids.srvr_bg, ui_widgets); .set(self.ids.srvr_bg, ui_widgets);
Image::new(self.imgs.input_bg) Image::new(self.imgs.input_bg)
.w_h(337.0, 67.0) .w_h(337.0, 67.0)
@ -557,10 +556,10 @@ impl MainMenuUi {
.w_h(258.0, 55.0) .w_h(258.0, 55.0)
.down_from(self.ids.address_bg, 20.0) .down_from(self.ids.address_bg, 20.0)
.align_middle_x_of(self.ids.address_bg) .align_middle_x_of(self.ids.address_bg)
.label("Login") .label("Multiplayer")
.label_font_id(self.fonts.cyri) .label_font_id(self.fonts.cyri)
.label_color(TEXT_COLOR) .label_color(TEXT_COLOR)
.label_font_size(26) .label_font_size(22)
.label_y(Relative::Scalar(5.0)) .label_y(Relative::Scalar(5.0))
/*.with_tooltip( /*.with_tooltip(
tooltip_manager, tooltip_manager,