From 1646d2c68afd74328b6340e878a141396876676c Mon Sep 17 00:00:00 2001 From: nek0 Date: Tue, 25 Sep 2018 17:37:30 +0200 Subject: [PATCH] post affection release changes --- shell.nix | 4 ++-- src/Types/UserData.hs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shell.nix b/shell.nix index 513c512..299b2d7 100644 --- a/shell.nix +++ b/shell.nix @@ -16,8 +16,8 @@ let version = "0.0.0.9"; src = fetchgit { url = "https://github.com/nek0/affection"; - sha256 = "16s1i0aa5xzrxliynfs1c0s7pb9pmmpyan8v6968hyx4h377b1p6"; - rev = "a6c314f3ac1b5fd9ccc2fbe8fe54b153b27c84c9"; + sha256 = "0jxrdx56wisg9ng9sd9rxzrifs6826d6vjzjgvm6wp1bivnn1kyw"; + rev = "f822b5cabb2050c8a06a7c396a4f258c03545ef1"; fetchSubmodules = true; }; configureFlags = [ "-fdebug" ]; diff --git a/src/Types/UserData.hs b/src/Types/UserData.hs index de1a84d..2977e12 100644 --- a/src/Types/UserData.hs +++ b/src/Types/UserData.hs @@ -53,7 +53,7 @@ data SubMain deriving (Eq) data Subsystems = Subsystems - { subWindow :: Window + { subWindow :: Types.UserData.Window , subMouse :: Mouse , subkeyboard :: Keyboard } @@ -62,8 +62,8 @@ newtype Window = Window (TVar [(UUID, WindowMessage -> Affection UserData())]) newtype Mouse = Mouse (TVar [(UUID, MouseMessage -> Affection UserData ())]) newtype Keyboard = Keyboard (TVar [(UUID, KeyboardMessage -> Affection UserData ())]) -instance Participant Window UserData where - type Mesg Window UserData = WindowMessage +instance Participant Types.UserData.Window UserData where + type Mesg Types.UserData.Window UserData = WindowMessage partSubscribers (Window t) = generalSubscribers t @@ -71,7 +71,7 @@ instance Participant Window UserData where partUnSubscribe (Window t) = generalUnSubscribe t -instance SDLSubsystem Window UserData where +instance SDLSubsystem Types.UserData.Window UserData where consumeSDLEvents = consumeSDLWindowEvents instance Participant Mouse UserData where