Skip to content

Commit

Permalink
Make WindowBuilder and HeadlessRendererBuilder derive Clone.
Browse files Browse the repository at this point in the history
  • Loading branch information
jansegre committed May 23, 2016
1 parent cf02e7f commit e0f36b8
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/api/android/mod.rs
Expand Up @@ -65,9 +65,9 @@ impl MonitorId {
}
}

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes;
#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

pub struct PollEventsIterator<'a> {
Expand Down
2 changes: 1 addition & 1 deletion src/api/cocoa/headless.rs
Expand Up @@ -13,7 +13,7 @@ use cocoa::appkit::*;
use PixelFormat;
use api::cocoa::helpers;

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

pub struct HeadlessContext {
Expand Down
2 changes: 1 addition & 1 deletion src/api/cocoa/mod.rs
Expand Up @@ -181,7 +181,7 @@ impl Drop for WindowDelegate {
}
}

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes {
pub activation_policy: ActivationPolicy,
}
Expand Down
2 changes: 1 addition & 1 deletion src/api/ios/mod.rs
Expand Up @@ -177,7 +177,7 @@ impl MonitorId {
}
}

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes;

impl Window {
Expand Down
1 change: 1 addition & 0 deletions src/headless.rs
Expand Up @@ -11,6 +11,7 @@ use Robustness;
use platform;

/// Object that allows you to build headless contexts.
#[derive(Clone)]
pub struct HeadlessRendererBuilder<'a> {
/// The dimensions to use.
pub dimensions: (u32, u32),
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Expand Up @@ -106,6 +106,7 @@ pub struct Window {
}

/// Object that allows you to build windows.
#[derive(Clone)]
pub struct WindowBuilder<'a> {
/// The attributes to use to create the window.
pub window: WindowAttributes,
Expand Down
4 changes: 2 additions & 2 deletions src/platform/emscripten/mod.rs
Expand Up @@ -58,7 +58,7 @@ impl GlContext for HeadlessContext {
unsafe impl Send for HeadlessContext {}
unsafe impl Sync for HeadlessContext {}

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes;
#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;
2 changes: 1 addition & 1 deletion src/platform/ios/mod.rs
Expand Up @@ -8,7 +8,7 @@ use ContextError;

pub use api::ios::*;

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

pub struct HeadlessContext(i32);
Expand Down
2 changes: 1 addition & 1 deletion src/platform/linux/api_dispatch.rs
Expand Up @@ -22,7 +22,7 @@ use api::x11::XConnection;
use api::x11::XError;
use api::x11::XNotSupported;

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes;

enum Backend {
Expand Down
2 changes: 1 addition & 1 deletion src/platform/linux/mod.rs
Expand Up @@ -15,7 +15,7 @@ pub use self::api_dispatch::{WaitEventsIterator, PollEventsIterator};
pub use self::api_dispatch::PlatformSpecificWindowBuilderAttributes;
mod api_dispatch;

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

pub struct HeadlessContext(OsMesaContext);
Expand Down
4 changes: 2 additions & 2 deletions src/platform/windows/mod.rs
Expand Up @@ -51,9 +51,9 @@ lazy_static! {
};
}

#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes;
#[derive(Default)]
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;

/// The Win32 implementation of the main `Window` object.
Expand Down

0 comments on commit e0f36b8

Please sign in to comment.