mirror of
https://gitlab.com/sheaf/metabrush.git
synced 2024-11-05 23:03:38 +00:00
use ?self to address pointer ownership warnings
This commit is contained in:
parent
36a6a3ca4b
commit
c3bcce58a7
|
@ -24,6 +24,17 @@ package hmatrix
|
||||||
-- location: https://github.com/haskell/mtl
|
-- location: https://github.com/haskell/mtl
|
||||||
-- tag: c8af65eb8437aebefd7f3ff1664316a0240f2157
|
-- tag: c8af65eb8437aebefd7f3ff1664316a0240f2157
|
||||||
|
|
||||||
|
source-repository-package
|
||||||
|
type: git
|
||||||
|
location: https://github.com/haskell-gi/haskell-gi
|
||||||
|
tag: fad0097a80b942137b7c423f6d9698fff4abeb28
|
||||||
|
|
||||||
|
source-repository-package
|
||||||
|
type: git
|
||||||
|
location: https://github.com/haskell-gi/haskell-gi
|
||||||
|
tag: fad0097a80b942137b7c423f6d9698fff4abeb28
|
||||||
|
subdir: base
|
||||||
|
|
||||||
-- GHC 9.0 compatibility for 'generics-lens' version 1.2
|
-- GHC 9.0 compatibility for 'generics-lens' version 1.2
|
||||||
source-repository-package
|
source-repository-package
|
||||||
type: git
|
type: git
|
||||||
|
|
|
@ -67,9 +67,6 @@ import qualified GI.Gdk as GDK
|
||||||
-- gi-gio
|
-- gi-gio
|
||||||
import qualified GI.Gio as GIO
|
import qualified GI.Gio as GIO
|
||||||
|
|
||||||
-- gi-gobject
|
|
||||||
import qualified GI.GObject as GObject
|
|
||||||
|
|
||||||
-- gi-gtk
|
-- gi-gtk
|
||||||
import qualified GI.Gtk as GTK
|
import qualified GI.Gtk as GTK
|
||||||
|
|
||||||
|
@ -1140,7 +1137,7 @@ instance HandleAction KeyboardPress where
|
||||||
-> do
|
-> do
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
-- With the pen tool, pressing control moves
|
-- With the pen tool, pressing control moves
|
||||||
-- the partial point control point to the mouse position.
|
-- the partial path control point to the mouse position.
|
||||||
tool <- STM.readTVarIO toolTVar
|
tool <- STM.readTVarIO toolTVar
|
||||||
mbMousePos <- STM.readTVarIO mousePosTVar
|
mbMousePos <- STM.readTVarIO mousePosTVar
|
||||||
mbPartialPath <- STM.readTVarIO partialPathTVar
|
mbPartialPath <- STM.readTVarIO partialPathTVar
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{-# LANGUAGE BlockArguments #-}
|
{-# LANGUAGE BlockArguments #-}
|
||||||
{-# LANGUAGE DeriveTraversable #-}
|
{-# LANGUAGE DeriveTraversable #-}
|
||||||
{-# LANGUAGE DerivingStrategies #-}
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE MonoLocalBinds #-}
|
||||||
{-# LANGUAGE NamedFieldPuns #-}
|
{-# LANGUAGE NamedFieldPuns #-}
|
||||||
{-# LANGUAGE OverloadedStrings #-}
|
{-# LANGUAGE OverloadedStrings #-}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{-# LANGUAGE BlockArguments #-}
|
{-# LANGUAGE BlockArguments #-}
|
||||||
{-# LANGUAGE DerivingStrategies #-}
|
{-# LANGUAGE DerivingStrategies #-}
|
||||||
|
{-# LANGUAGE ImplicitParams #-}
|
||||||
{-# LANGUAGE RecordWildCards #-}
|
{-# LANGUAGE RecordWildCards #-}
|
||||||
{-# LANGUAGE TypeApplications #-}
|
{-# LANGUAGE TypeApplications #-}
|
||||||
|
|
||||||
|
@ -70,9 +71,9 @@ handleEvents elts@( UIElements { viewport = Viewport {..}, .. } ) vars = do
|
||||||
void $ GTK.afterEventControllerScrollScroll viewportScrollController
|
void $ GTK.afterEventControllerScrollScroll viewportScrollController
|
||||||
( handleScrollEvent elts vars )
|
( handleScrollEvent elts vars )
|
||||||
void $ GTK.afterGestureClickPressed viewportClicksController
|
void $ GTK.afterGestureClickPressed viewportClicksController
|
||||||
( handleMouseButtonEvent elts vars eventOrigin viewportClicksController )
|
( handleMouseButtonEvent elts vars eventOrigin ?self )
|
||||||
void $ GTK.afterGestureClickReleased viewportClicksController
|
void $ GTK.afterGestureClickReleased viewportClicksController
|
||||||
( handleMouseButtonRelease elts vars eventOrigin viewportClicksController )
|
( handleMouseButtonRelease elts vars eventOrigin ?self )
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
-- Mouse events.
|
-- Mouse events.
|
||||||
|
|
|
@ -6,8 +6,6 @@ module MetaBrush.UI.InfoBar
|
||||||
import qualified GI.Gtk as GTK
|
import qualified GI.Gtk as GTK
|
||||||
|
|
||||||
-- MetaBrush
|
-- MetaBrush
|
||||||
import MetaBrush.Asset.Colours
|
|
||||||
( Colours )
|
|
||||||
import {-# SOURCE #-} MetaBrush.Context
|
import {-# SOURCE #-} MetaBrush.Context
|
||||||
( Variables )
|
( Variables )
|
||||||
import MetaBrush.Document
|
import MetaBrush.Document
|
||||||
|
|
Loading…
Reference in a new issue