diff --git a/os/src/assert/desktop.bmp b/os/src/assert/desktop.bmp index d8545df0df447db8b189f14f72f9ae6ca6b95e27..a754f7a7e2fa0b5012e83216eb644c2b82c3fb54 100644 Binary files a/os/src/assert/desktop.bmp and b/os/src/assert/desktop.bmp differ diff --git a/os/src/gui/graphic.rs b/os/src/gui/graphic.rs index 0fdfce933cd5e627c4b4e73696ad835aba703a40..2092d71a6525c1a0f3007bea2ec40e945be72ad0 100644 --- a/os/src/gui/graphic.rs +++ b/os/src/gui/graphic.rs @@ -42,7 +42,7 @@ impl DrawTarget for Graphics { let fb = self.drv.getfreambuffer(); pixels.into_iter().for_each(|px| { - let idx = ((self.point.y + px.0.y) * 1024 + self.point.x + px.0.x) as usize * 4; + let idx = ((self.point.y + px.0.y) * 1280 + self.point.x + px.0.x) as usize * 4; if idx + 2 >= fb.len() { return; } diff --git a/os/src/gui/icon.rs b/os/src/gui/icon.rs index d70462a144a158f781669b1850c5b645abefd77b..645d9e79b050af3b28208137f2c6c461e67c9318 100644 --- a/os/src/gui/icon.rs +++ b/os/src/gui/icon.rs @@ -32,7 +32,7 @@ impl IconController { UPIntrFreeCell::new(IconControllerInner { files, graphic: Graphics { - size: Size::new(1024, 768), + size: Size::new(1280, 800), point: Point::new(0, 0), drv: GPU_DEVICE.clone(), }, diff --git a/os/src/syscall/gui.rs b/os/src/syscall/gui.rs index 9ca7f45a0642512c64951e5107f98492ba94a2aa..5340d11a1e2d83e6fa5e615a7ed86e856f840e70 100644 --- a/os/src/syscall/gui.rs +++ b/os/src/syscall/gui.rs @@ -14,7 +14,7 @@ static DT: &[u8] = include_bytes!("../assert/desktop.bmp"); lazy_static::lazy_static!( pub static ref DESKTOP:UPIntrFreeCell> = unsafe { - UPIntrFreeCell::new(Arc::new(Panel::new(Size::new(1024, 768), Point::new(0, 0)))) + UPIntrFreeCell::new(Arc::new(Panel::new(Size::new(1280, 800), Point::new(0, 0)))) }; pub static ref PAD:UPIntrFreeCell>> = unsafe { UPIntrFreeCell::new(None) @@ -23,8 +23,8 @@ lazy_static::lazy_static!( pub fn create_desktop() -> isize { let mut p: Arc = - Arc::new(Panel::new(Size::new(1024, 768), Point::new(0, 0))); - let image = ImageComp::new(Size::new(1024, 768), Point::new(0, 0), DT, Some(p.clone())); + Arc::new(Panel::new(Size::new(1280, 800), Point::new(0, 0))); + let image = ImageComp::new(Size::new(1280, 800), Point::new(0, 0), DT, Some(p.clone())); let icon = IconController::new(ROOT_INODE.ls(), Some(p.clone())); p.add(Arc::new(image)); p.add(Arc::new(icon));