Make Buffer::width/height return u32 instead of NonZeroU32

Author: madsmtm

examples/animation.rs

@@ -62,7 +62,7 @@ fn main() {
 
                 let mut buffer = surface.buffer_mut().unwrap();
 
-                let size = (buffer.width().get(), buffer.height().get());
+                let size = (buffer.width(), buffer.height());
                 if size != *old_size {
                     *old_size = size;
                     *frames = pre_render_frames(size.0, size.1);

examples/rectangle.rs

@@ -8,8 +8,8 @@ use winit::keyboard::{Key, NamedKey};
 mod util;
 
 fn redraw(buffer: &mut Buffer<'_, impl HasDisplayHandle, impl HasWindowHandle>, flag: bool) {
-    let width = buffer.width().get();
-    let height = buffer.height().get();
+    let width = buffer.width();
+    let height = buffer.height();
     for y in 0..height {
         for x in 0..width {
             let value = if flag && x >= 100 && x < width - 100 && y >= 100 && y < height - 100 {

examples/winit.rs

@@ -46,12 +46,12 @@ pub(crate) fn entry(event_loop: EventLoop<()>) {
                 };
 
                 let mut buffer = surface.buffer_mut().unwrap();
-                for y in 0..buffer.height().get() {
-                    for x in 0..buffer.width().get() {
+                for y in 0..buffer.height() {
+                    for x in 0..buffer.width() {
                         let red = x % 255;
                         let green = y % 255;
                         let blue = (x * y) % 255;
-                        let index = y * buffer.width().get() + x;
+                        let index = y * buffer.width() + x;
                         buffer[index as usize] = blue | (green << 8) | (red << 16);
                     }
                 }

examples/winit_multithread.rs

@@ -32,12 +32,12 @@ pub mod ex {
             surface.resize(width, height).unwrap();
 
             let mut buffer = surface.buffer_mut().unwrap();
-            for y in 0..buffer.height().get() {
-                for x in 0..buffer.width().get() {
+            for y in 0..buffer.height() {
+                for x in 0..buffer.width() {
                     let red = x % 255;
                     let green = y % 255;
                     let blue = (x * y) % 255;
-                    let index = y * buffer.width().get() + x;
+                    let index = y * buffer.width() + x;
                     buffer[index as usize] = blue | (green << 8) | (red << 16);
                 }
             }

examples/winit_wrong_sized_buffer.rs

@@ -37,8 +37,8 @@ fn main() {
                 };
 
                 let mut buffer = surface.buffer_mut().unwrap();
-                let width = buffer.width().get();
-                for y in 0..buffer.height().get() {
+                let width = buffer.width();
+                for y in 0..buffer.height() {
                     for x in 0..width {
                         let red = x % 255;
                         let green = y % 255;

src/backend_dispatch.rs

@@ -147,7 +147,7 @@ macro_rules! make_dispatch {
 
         impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferDispatch<'a, D, W> {
             #[inline]
-            fn width(&self) -> NonZeroU32 {
+            fn width(&self) -> u32 {
                 match self {
                     $(
                         $(#[$attr])*
@@ -157,7 +157,7 @@ macro_rules! make_dispatch {
             }
 
             #[inline]
-            fn height(&self) -> NonZeroU32 {
+            fn height(&self) -> u32 {
                 match self {
                     $(
                         $(#[$attr])*

src/backend_interface.rs

@@ -35,8 +35,8 @@ pub(crate) trait SurfaceInterface<D: HasDisplayHandle + ?Sized, W: HasWindowHand
 }
 
 pub(crate) trait BufferInterface {
-    fn width(&self) -> NonZeroU32;
-    fn height(&self) -> NonZeroU32;
+    fn width(&self) -> u32;
+    fn height(&self) -> u32;
     fn pixels(&self) -> &[u32];
     fn pixels_mut(&mut self) -> &mut [u32];
     fn age(&self) -> u8;

src/backends/android.rs

@@ -125,12 +125,12 @@ pub struct BufferImpl<'a, D: ?Sized, W> {
 unsafe impl<'a, D, W> Send for BufferImpl<'a, D, W> {}
 
 impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'a, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.native_window_buffer.width() as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.native_window_buffer.width() as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.native_window_buffer.height() as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.native_window_buffer.height() as u32
     }
 
     #[inline]

src/backends/cg.rs

@@ -273,12 +273,12 @@ pub struct BufferImpl<'a, D, W> {
 }
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.width as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.imp.width as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.height as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.imp.height as u32
     }
 
     #[inline]

src/backends/kms.rs

@@ -301,12 +301,12 @@ impl<D: ?Sized, W: ?Sized> Drop for KmsImpl<D, W> {
 }
 
 impl<D: ?Sized, W: ?Sized> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        self.size.0
+    fn width(&self) -> u32 {
+        self.size.0.get()
     }
 
-    fn height(&self) -> NonZeroU32 {
-        self.size.1
+    fn height(&self) -> u32 {
+        self.size.1.get()
     }
 
     #[inline]