Skip to content

Commit 27312b4

Browse files
committed
Resolve typechange issues on Windows.
MSVC sometimes makes enums signed instead of unsigned. This isn't an issue except when using Bindgen, which we are now doing. So, we cast to the correct type (u32) at origin from ui-sys.
1 parent 4efa74f commit 27312b4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

iui/src/controls/layout.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,12 @@ pub enum GridAlignment {
280280
impl GridAlignment {
281281
fn into_ui_align(self) -> uiAlign {
282282
use self::GridAlignment::*;
283-
match self {
283+
return match self {
284284
Fill => ui_sys::uiAlignFill,
285285
Start => ui_sys::uiAlignStart,
286286
Center => ui_sys::uiAlignCenter,
287287
End => ui_sys::uiAlignEnd
288-
}
288+
} as uiAlign;
289289
}
290290
}
291291

@@ -305,12 +305,12 @@ pub enum GridInsertionStrategy {
305305
impl GridInsertionStrategy {
306306
fn into_ui_at(self) -> uiAt {
307307
use self::GridInsertionStrategy::*;
308-
match self {
308+
return match self {
309309
Leading => ui_sys::uiAtLeading,
310310
Top => ui_sys::uiAtTop,
311311
Trailing => ui_sys::uiAtTrailing,
312312
Bottom => ui_sys::uiAtBottom
313-
}
313+
} as uiAlign;
314314
}
315315
}
316316

iui/src/draw/brush.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ impl Brush {
2626
match *self {
2727
Brush::Solid(ref solid_brush) => BrushRef {
2828
ui_draw_brush: uiDrawBrush {
29-
Type: ui_sys::uiDrawBrushTypeSolid,
29+
Type: ui_sys::uiDrawBrushTypeSolid as u32,
3030

3131
R: solid_brush.r,
3232
G: solid_brush.g,
@@ -45,7 +45,7 @@ impl Brush {
4545
},
4646
Brush::LinearGradient(ref linear_gradient_brush) => BrushRef {
4747
ui_draw_brush: uiDrawBrush {
48-
Type: ui_sys::uiDrawBrushTypeLinearGradient,
48+
Type: ui_sys::uiDrawBrushTypeLinearGradient as u32,
4949

5050
R: 0.0,
5151
G: 0.0,
@@ -64,7 +64,7 @@ impl Brush {
6464
},
6565
Brush::RadialGradient(ref radial_gradient_brush) => BrushRef {
6666
ui_draw_brush: uiDrawBrush {
67-
Type: ui_sys::uiDrawBrushTypeRadialGradient,
67+
Type: ui_sys::uiDrawBrushTypeRadialGradient as u32,
6868

6969
R: 0.0,
7070
G: 0.0,
@@ -85,7 +85,7 @@ impl Brush {
8585
// These don't work yet in `libui`, but just for completeness' sake…
8686
BrushRef {
8787
ui_draw_brush: uiDrawBrush {
88-
Type: ui_sys::uiDrawBrushTypeImage,
88+
Type: ui_sys::uiDrawBrushTypeImage as u32,
8989

9090
R: 0.0,
9191
G: 0.0,

0 commit comments

Comments
 (0)