Delete conrod main menu code!!!!!!, small tweaks

This commit is contained in:
Imbris 2020-06-10 02:37:52 -04:00
parent ba573d2065
commit 10c046be2f
9 changed files with 59 additions and 859 deletions

Binary file not shown.

View File

@ -84,16 +84,9 @@ impl PlayState for MainMenuState {
match event {
Event::Close => return PlayStateResult::Shutdown,
// Pass events to ui.
Event::Ui(event) => {
self.main_menu_ui.handle_event(event);
},
// Pass events to iced ui.
Event::IcedUi(event) => {
self.main_menu_ui.handle_iced_event(event);
},
Event::InputUpdate(crate::window::GameInput::Jump, true) => {
self.main_menu_ui.show_iced ^= true;
},
// Ignore all other events.
_ => {},
}
@ -262,7 +255,6 @@ impl PlayState for MainMenuState {
global_state.singleplayer = Some(singleplayer);
},
MainMenuEvent::Settings => {}, // TODO
MainMenuEvent::Quit => return PlayStateResult::Shutdown,
/*MainMenuEvent::DisclaimerAccepted => {
global_state.settings.show_disclaimer = false

View File

@ -1,4 +1,4 @@
use super::{ConnectionState, IcedImgs as Imgs, Message};
use super::{ConnectionState, Message};
use crate::{
i18n::Localization,
ui::{
@ -93,7 +93,7 @@ impl Screen {
.into(),
])
.spacing(4)
.max_width(500)
.max_width(520)
.width(Length::Fill)
.height(Length::Fill);
@ -103,7 +103,7 @@ impl Screen {
(11, 11, 11, 255).into(),
(54, 46, 38, 255).into(),
))
.padding(10);
.padding(20);
let container = Container::new(prompt_window)
.width(Length::Fill)

View File

@ -1,4 +1,4 @@
use super::{IcedImgs as Imgs, Message};
use super::Message;
use crate::{
i18n::Localization,
ui::{

View File

@ -1,4 +1,4 @@
use super::{IcedImgs as Imgs, LoginInfo, Message};
use super::{Imgs, LoginInfo, Message};
use crate::{
i18n::Localization,
ui::{

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
use super::{IcedImgs as Imgs, Message};
use super::Message;
use crate::{
i18n::Localization,
ui::{