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

Remove background banner from login screen input boxes and move logo to right corner

Browse Source
This commit is contained in:
Imbris 2020-09-16 03:16:41 -04:00
parent bae7f56393
commit 489a8a8f9e
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
voxygen/src/menu/main/ui/login.rs
View File

@ -62,6 +62,7 @@ impl Screen {
selected_language_index: Option<usize>,
language_metadatas: &[crate::i18n::LanguageMetadata],
button_style: style::button::Style,
version: &str,
) -> Element<Message> {
let buttons = Column::with_children(vec![
neat_button(
@ -94,7 +95,7 @@ impl Screen {
),
])
.width(Length::Fill)
.max_width(200)
.max_width(160)
.spacing(5);
let buttons = Container::new(buttons)
@ -176,7 +177,18 @@ impl Screen {
.center_x()
.center_y();
let right_column = Space::new(Length::Fill, Length::Fill);
let v_logo = Container::new(Image::new(imgs.v_logo).fix_aspect_ratio())
.padding(3)
.width(Length::Units(230));
let version = iced::Text::new(version).size(fonts.cyri.scale(15));
let right_column = Container::new(
Column::with_children(vec![v_logo.into(), version.into()]).align_items(Align::Center),
)
.width(Length::Fill)
.height(Length::Fill)
.align_x(Align::End);
Row::with_children(vec![
left_column,
@ -338,11 +350,6 @@ impl LoginBanner {
let input_text_size = fonts.cyri.scale(INPUT_TEXT_SIZE);
let banner_content = Column::with_children(vec![
Container::new(Image::new(imgs.v_logo).fix_aspect_ratio())
.padding(10)
.height(Length::FillPortion(25))
.into(),
// TODO: i18n
Column::with_children(vec![
BackgroundContainer::new(
Image::new(imgs.input_bg)
@ -391,10 +398,10 @@ impl LoginBanner {
.padding(Padding::new().horizontal(7).top(5))
.into(),
])
.spacing(10)
.height(Length::FillPortion(35))
.spacing(5)
//.height(Length::Units(200))
.into(),
Space::new(Length::Fill, Length::FillPortion(2)).into(),
Space::new(Length::Fill, Length::Units(8)).into(),
Column::with_children(vec![
neat_button(
&mut self.multiplayer_button,
@ -413,28 +420,18 @@ impl LoginBanner {
),
])
.max_width(200)
.height(Length::FillPortion(38))
.height(Length::Units(200))
.spacing(8)
.into(),
])
.width(Length::Fill)
.height(Length::Fill)
.align_items(Align::Center);
let banner = BackgroundContainer::new(
CompoundGraphic::from_graphics(vec![
Graphic::image(imgs.banner_top, [138, 17], [0, 0]),
Graphic::rect(Rgba::new(0, 0, 0, 230), [130, 165], [4, 17]),
// TODO: use non image gradient
Graphic::gradient(Rgba::new(0, 0, 0, 230), Rgba::zero(), [130, 50], [4, 182]),
])
.fix_aspect_ratio()
.height(Length::Fill),
banner_content,
)
.padding(Padding::new().horizontal(8).vertical(15))
.max_width(350);
banner.into()
Container::new(banner_content)
.height(Length::Fill)
.center_y()
.into()
//.padding(Padding::new().horizontal(8).vertical(15))
//.max_width(350);
}
}

17
voxygen/src/menu/main/ui/mod.rs
View File

@ -253,11 +253,6 @@ impl Controls {
.text_color(TEXT_COLOR)
.disabled_text_color(DISABLED_TEXT_COLOR);
let version = iced::Text::new(&self.version)
.size(self.fonts.cyri.scale(15))
.width(Length::Fill)
.horizontal_alignment(HorizontalAlignment::Right);
let alpha = iced::Text::new(&self.alpha)
.size(self.fonts.cyri.scale(12))
.width(Length::Fill)
@ -266,7 +261,16 @@ impl Controls {
let top_text = Row::with_children(vec![
Space::new(Length::Fill, Length::Shrink).into(),
alpha.into(),
version.into(),
if matches!(&self.screen, Screen::Login { .. }) {
// Login screen shows the Velroen logo over the version
Space::new(Length::Fill, Length::Shrink).into()
} else {
iced::Text::new(&self.version)
.size(self.fonts.cyri.scale(15))
.width(Length::Fill)
.horizontal_alignment(HorizontalAlignment::Right)
.into()
},
])
.width(Length::Fill);
@ -292,6 +296,7 @@ impl Controls {
self.selected_language_index,
&language_metadatas,
button_style,
&self.version,
),
Screen::Servers { screen } => screen.view(
&self.fonts,