leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x11, android, win32: [ui]size, [u]int -> [ui]32

Browse source
This commit is contained in:
Andrey Lesnikov 2015-01-13 15:21:36 +03:00
parent d11f63a749
commit 5a4fee967a
10 changed files with 91 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/win32/monitor.rs
View file

@ -17,10 +17,10 @@ pub struct MonitorID {
/// The position of the monitor in pixels on the desktop.
///
/// A window that is positionned at these coordinates will overlap the monitor.
position: (uint, uint),
position: (u32, u32),
/// The current resolution in pixels on the monitor.
dimensions: (uint, uint),
dimensions: (u32, u32),
}
/// Win32 implementation of the main `get_available_monitors` function.
@ -32,7 +32,7 @@ pub fn get_available_monitors() -> RingBuf<MonitorID> {
// enumerating the devices is done by querying device 0, then device 1, then device 2, etc.
// until the query function returns null
for id in iter::count(0u, 1) {
for id in iter::count(0u32, 1) {
// getting the DISPLAY_DEVICEW object of the current device
let output = {
let mut output: winapi::DISPLAY_DEVICEW = unsafe { mem::zeroed() };
@ -72,9 +72,9 @@ pub fn get_available_monitors() -> RingBuf<MonitorID> {
}
let point: &winapi::POINTL = mem::transmute(&dev.union1);
let position = (point.x as uint, point.y as uint);
let position = (point.x as u32, point.y as u32);
let dimensions = (dev.dmPelsWidth as uint, dev.dmPelsHeight as uint);
let dimensions = (dev.dmPelsWidth as u32, dev.dmPelsHeight as u32);
(position, dimensions)
};
@ -113,7 +113,7 @@ impl MonitorID {
}
/// See the docs if the crate root file.
pub fn get_dimensions(&self) -> (uint, uint) {
pub fn get_dimensions(&self) -> (u32, u32) {
// TODO: retreive the dimensions every time this is called
self.dimensions
}
@ -127,7 +127,7 @@ impl MonitorID {
/// This is a Win32-only function for `MonitorID` that returns the position of the
/// monitor on the desktop.
/// A window that is positionned at these coordinates will overlap the monitor.
pub fn get_position(&self) -> (uint, uint) {
pub fn get_position(&self) -> (u32, u32) {
self.position
}
}