From 1c5c72477cf28cbf163a730ab6289a2051230beb Mon Sep 17 00:00:00 2001 From: AzureMarker Date: Thu, 13 Jan 2022 19:37:58 -0800 Subject: [PATCH] Import Screen in examples to improve consistency --- ctru-rs/examples/buttons.rs | 4 ++-- ctru-rs/examples/gfx_wide_mode.rs | 2 +- ctru-rs/examples/hello-both-screens.rs | 4 ++-- ctru-rs/examples/hello-world.rs | 4 ++-- ctru-rs/examples/software-keyboard.rs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ctru-rs/examples/buttons.rs b/ctru-rs/examples/buttons.rs index 4c7fd60..36127cd 100644 --- a/ctru-rs/examples/buttons.rs +++ b/ctru-rs/examples/buttons.rs @@ -1,5 +1,5 @@ use ctru::console::Console; -use ctru::gfx::Gfx; +use ctru::gfx::{Gfx, Screen}; use ctru::services::apt::Apt; use ctru::services::hid::{Hid, KeyPad}; @@ -9,7 +9,7 @@ fn main() { let apt = Apt::init().unwrap(); let hid = Hid::init().unwrap(); let gfx = Gfx::default(); - let console = Console::init(&gfx, ctru::gfx::Screen::Top); + let console = Console::init(&gfx, Screen::Top); println!("Hi there! Try pressing a button"); println!("\x1b[29;16HPress Start to exit"); diff --git a/ctru-rs/examples/gfx_wide_mode.rs b/ctru-rs/examples/gfx_wide_mode.rs index 8572f33..f4ba365 100644 --- a/ctru-rs/examples/gfx_wide_mode.rs +++ b/ctru-rs/examples/gfx_wide_mode.rs @@ -11,7 +11,7 @@ fn main() { let apt = Apt::init().unwrap(); let hid = Hid::init().unwrap(); let gfx = Gfx::default(); - let _console = Console::init(&gfx, ctru::gfx::Screen::Top); + let _console = Console::init(&gfx, Screen::Top); println!("Press A to enable/disable wide screen mode."); diff --git a/ctru-rs/examples/hello-both-screens.rs b/ctru-rs/examples/hello-both-screens.rs index 22a1783..180b1b2 100644 --- a/ctru-rs/examples/hello-both-screens.rs +++ b/ctru-rs/examples/hello-both-screens.rs @@ -11,11 +11,11 @@ fn main() { let gfx = Gfx::default(); // Start a console on the top screen - let top_screen = Console::init(&gfx, ctru::gfx::Screen::Top); + let top_screen = Console::init(&gfx, Screen::Top); // Start a console on the bottom screen. // The most recently initialized console will be active by default - let bottom_screen = Console::init(&gfx, ctru::gfx::Screen::Bottom); + let bottom_screen = Console::init(&gfx, Screen::Bottom); // Let's print on the top screen first top_screen.select(); diff --git a/ctru-rs/examples/hello-world.rs b/ctru-rs/examples/hello-world.rs index 7f76266..ccebef7 100644 --- a/ctru-rs/examples/hello-world.rs +++ b/ctru-rs/examples/hello-world.rs @@ -1,5 +1,5 @@ use ctru::console::Console; -use ctru::gfx::Gfx; +use ctru::gfx::{Gfx, Screen}; use ctru::services::apt::Apt; use ctru::services::hid::{Hid, KeyPad}; @@ -21,7 +21,7 @@ fn main() { // Initialize a ctrulib console and direct standard output to it. // Consoles can be initialized on both the top and bottom screens. - let _console = Console::init(&gfx, ctru::gfx::Screen::Top); + let _console = Console::init(&gfx, Screen::Top); // Now we can print to stdout! println!("Hello, world!"); diff --git a/ctru-rs/examples/software-keyboard.rs b/ctru-rs/examples/software-keyboard.rs index 495f9c1..b3b9347 100644 --- a/ctru-rs/examples/software-keyboard.rs +++ b/ctru-rs/examples/software-keyboard.rs @@ -1,6 +1,6 @@ use ctru::applets::swkbd::{Button, Swkbd}; use ctru::console::Console; -use ctru::gfx::Gfx; +use ctru::gfx::{Gfx, Screen}; use ctru::services::apt::Apt; use ctru::services::hid::{Hid, KeyPad}; @@ -9,7 +9,7 @@ fn main() { let apt = Apt::init().unwrap(); let hid = Hid::init().unwrap(); let gfx = Gfx::default(); - let _console = Console::init(&gfx, ctru::gfx::Screen::Top); + let _console = Console::init(&gfx, Screen::Top); println!("Press A to enter some text or press Start to quit");