Commit 7b755a8b authored by Roman 3237465's avatar Roman 3237465

various minor fixes

parent 4b907d3e
...@@ -62,6 +62,6 @@ ...@@ -62,6 +62,6 @@
/qtah-qt?/src/Graphics/UI/Qtah/Std.hs /qtah-qt?/src/Graphics/UI/Qtah/Std.hs
/qtah-qt?/src/Graphics/UI/Qtah/Widgets/Q* /qtah-qt?/src/Graphics/UI/Qtah/Widgets/Q*
*.*~ *~
.stack-work .stack-work
...@@ -64,7 +64,6 @@ c_QRectF = ...@@ -64,7 +64,6 @@ c_QRectF =
makeClass (ident "QRectF") Nothing [] $ makeClass (ident "QRectF") Nothing [] $
collect collect
[ just $ mkCtor "newNull" [] [ just $ mkCtor "newNull" []
, just $ mkCtor "newCoord" [doubleT, doubleT, doubleT, doubleT]
, test (qtVersion >= [4, 3]) $ mkCtor "newFromPoints" [objT c_QPointF, objT c_QPointF] , test (qtVersion >= [4, 3]) $ mkCtor "newFromPoints" [objT c_QPointF, objT c_QPointF]
, just $ mkCtor "newWithPointAndSize" [objT c_QPointF, objT c_QSizeF] , just $ mkCtor "newWithPointAndSize" [objT c_QPointF, objT c_QSizeF]
, just $ mkCtor "newWithRect" [objT c_QRect] , just $ mkCtor "newWithRect" [objT c_QRect]
......
...@@ -51,5 +51,5 @@ c_QTransform = ...@@ -51,5 +51,5 @@ c_QTransform =
classAddFeatures [Assignable, Copyable, Equatable] $ classAddFeatures [Assignable, Copyable, Equatable] $
classSetEntityPrefix "" $ classSetEntityPrefix "" $
makeClass (ident "QTransform") Nothing [] $ makeClass (ident "QTransform") Nothing [] $
[ mkCtor "new" [doubleT, doubleT, doubleT, doubleT, doubleT, doubleT] [ mkCtor "new2x2" [doubleT, doubleT, doubleT, doubleT, doubleT, doubleT]
] ]
...@@ -74,7 +74,7 @@ c_QGraphicsItem = ...@@ -74,7 +74,7 @@ c_QGraphicsItem =
, mkConstMethod "acceptTouchEvents" [] boolT , mkConstMethod "acceptTouchEvents" [] boolT
-- TODO mkConstMethod "acceptedMouseButtons" [] $ objT c_Qt::MouseButtons -- TODO mkConstMethod "acceptedMouseButtons" [] $ objT c_Qt::MouseButtons
, mkMethod "advance" [intT] voidT , mkMethod "advance" [intT] voidT
, mkMethod "boundingRect" [] $ objT c_QRectF , mkConstMethod "boundingRect" [] $ objT c_QRectF
-- TODO mkConstMethod "boundingRegion" [objT c_QTransform] $ objT c_QRegion -- TODO mkConstMethod "boundingRegion" [objT c_QTransform] $ objT c_QRegion
, mkConstMethod "boundingRegionGranularity" [] doubleT , mkConstMethod "boundingRegionGranularity" [] doubleT
-- TODO mkConstMethod "cacheMode" [] $ objT bs_CacheMode -- TODO mkConstMethod "cacheMode" [] $ objT bs_CacheMode
...@@ -293,7 +293,7 @@ c_QGraphicsItem = ...@@ -293,7 +293,7 @@ c_QGraphicsItem =
, mkMethod "setToolTip" [objT c_QString] voidT , mkMethod "setToolTip" [objT c_QString] voidT
-- TODO mkMethod "setTransform" [objT c_QTransform] voidT -- TODO mkMethod "setTransform" [objT c_QTransform] voidT
-- TODO mkMethod' "setTransform" "setTransformAll" [objT c_QTransform, boolT] voidT -- TODO mkMethod' "setTransform" "setTransformAll" [objT c_QTransform, boolT] voidT
, mkMethod' "setTransformOriginPoint" "setTransformOriginPointPointF" [objT c_QPointF] voidT , mkMethod' "setTransformOriginPoint" "setTransformOriginPointF" [objT c_QPointF] voidT
, mkMethod' "setTransformOriginPoint" "setTransformOriginPointRaw" [doubleT, doubleT] voidT , mkMethod' "setTransformOriginPoint" "setTransformOriginPointRaw" [doubleT, doubleT] voidT
-- TODO mkMethod "setTransformations" [objT c_QList<QGraphicsTransform] voidT -- TODO mkMethod "setTransformations" [objT c_QList<QGraphicsTransform] voidT
, mkMethod "setVisible" [boolT] voidT , mkMethod "setVisible" [boolT] voidT
...@@ -364,8 +364,8 @@ e_GraphicsItemChange = ...@@ -364,8 +364,8 @@ e_GraphicsItemChange =
, (20, ["item","tool","tip","has","changed"]) , (20, ["item","tool","tip","has","changed"])
, (21, ["item","flags","change"]) , (21, ["item","flags","change"])
, (22, ["item","flags","have","changed"]) , (22, ["item","flags","have","changed"])
, (23, ["item","zvalue","change"]) , (23, ["item","z","value","change"])
, (24, ["item","zvalue","has","changed"]) , (24, ["item","z","value","has","changed"])
, (25, ["item","opacity","change"]) , (25, ["item","opacity","change"])
, (26, ["item","opacity","has","changed"]) , (26, ["item","opacity","has","changed"])
, (27, ["item","scene","position","has","changed"]) , (27, ["item","scene","position","has","changed"])
...@@ -388,7 +388,7 @@ e_GraphicsItemChange = ...@@ -388,7 +388,7 @@ e_GraphicsItemChange =
, just $ (0x400, ["item","has","no","contents"]) , just $ (0x400, ["item","has","no","contents"])
, just $ (0x800, ["item","sends","geometry","changes"]) , just $ (0x800, ["item","sends","geometry","changes"])
, just $ (0x1000, ["item","accepts","input","method"]) , just $ (0x1000, ["item","accepts","input","method"])
, just $ (0x2000, ["item","negative","zstacks","behind","parent"]) , just $ (0x2000, ["item","negative","z","stacks","behind","parent"])
, just $ (0x4000, ["item","is","panel"]) , just $ (0x4000, ["item","is","panel"])
, just $ (0x10000, ["item","sends","scene","position","changes"]) , just $ (0x10000, ["item","sends","scene","position","changes"])
, test (qtVersion >= [5, 4]) $ (0x80000, ["item","contains","children","in","shape"]) , test (qtVersion >= [5, 4]) $ (0x80000, ["item","contains","children","in","shape"])
......
...@@ -50,7 +50,8 @@ c_QGraphicsRectItem = ...@@ -50,7 +50,8 @@ c_QGraphicsRectItem =
addReqIncludes [includeStd "QGraphicsRectItem"] $ addReqIncludes [includeStd "QGraphicsRectItem"] $
classSetEntityPrefix "" $ classSetEntityPrefix "" $
makeClass (ident "QGraphicsRectItem") Nothing [c_QAbstractGraphicsShapeItem] makeClass (ident "QGraphicsRectItem") Nothing [c_QAbstractGraphicsShapeItem]
[ mkCtor "new" [doubleT, doubleT, doubleT, doubleT] [ mkCtor "new" []
, mkCtor "newWithRect" [doubleT, doubleT, doubleT, doubleT]
, mkConstMethod "rect" [] $ objT c_QRectF , mkConstMethod "rect" [] $ objT c_QRectF
, mkMethod' "setRect" "setRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT , mkMethod' "setRect" "setRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
] ]
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
module Graphics.UI.Qtah.Generator.Interface.Widgets.QGraphicsSceneMouseEvent ( module Graphics.UI.Qtah.Generator.Interface.Widgets.QGraphicsSceneMouseEvent (
aModule, aModule,
c_QGraphicsSceneEvent, c_QGraphicsSceneMouseEvent,
) where ) where
import Foreign.Hoppy.Generator.Spec ( import Foreign.Hoppy.Generator.Spec (
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
module Graphics.UI.Qtah.Generator.Interface.Widgets.QGraphicsSceneWheelEvent ( module Graphics.UI.Qtah.Generator.Interface.Widgets.QGraphicsSceneWheelEvent (
aModule, aModule,
c_QGraphicsSceneEvent, c_QGraphicsSceneWheelEvent,
) where ) where
import Foreign.Hoppy.Generator.Spec ( import Foreign.Hoppy.Generator.Spec (
......
...@@ -195,7 +195,7 @@ c_QGraphicsView = ...@@ -195,7 +195,7 @@ c_QGraphicsView =
, mkMethod "setResizeAnchor" [enumT e_ViewportAnchor] voidT , mkMethod "setResizeAnchor" [enumT e_ViewportAnchor] voidT
-- TODO mkMethod "setRubberBandSelectionMode" [objT c_Qt::ItemSelectionMode] voidT -- TODO mkMethod "setRubberBandSelectionMode" [objT c_Qt::ItemSelectionMode] voidT
, mkMethod "setScene" [ptrT $ objT c_QGraphicsScene] voidT , mkMethod "setScene" [ptrT $ objT c_QGraphicsScene] voidT
, mkMethod' "setSceneRect" "setSceneRectRectF" [objT c_QRectF] voidT , mkMethod' "setSceneRect" "setSceneRectF" [objT c_QRectF] voidT
, mkMethod' "setSceneRect" "setSceneRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT , mkMethod' "setSceneRect" "setSceneRectRaw" [doubleT, doubleT, doubleT, doubleT] voidT
, mkMethod "setTransform" [objT c_QTransform] voidT , mkMethod "setTransform" [objT c_QTransform] voidT
, mkMethod' "setTransform" "setTransformAll" [objT c_QTransform, boolT] voidT , mkMethod' "setTransform" "setTransformAll" [objT c_QTransform, boolT] voidT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment