diff options
| author | Camil Staps | 2015-08-14 23:06:48 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-08-14 23:06:48 +0200 |
| commit | 0fc90da27d6840513f5f75a68a8d485c0d7d678d (patch) | |
| tree | 2d088af589d1e99b84ff825581459f9cb29bf5d2 /ospicture.icl | |
| parent | Checking equality of requested pen (back) colour and current colour causes he... (diff) | |
This is a hack, but for the moment forcing setting pen position fixes text positioning issues. Also removing commented code
Diffstat (limited to 'ospicture.icl')
| -rw-r--r-- | ospicture.icl | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ospicture.icl b/ospicture.icl index e76aa6c..3635805 100644 --- a/ospicture.icl +++ b/ospicture.icl @@ -192,12 +192,9 @@ setpictpen {penSize,penForeColour,penBackColour,penPos,penFont} picture // Change the pen position:
setpictpenpos :: !Point2 !*Picture -> *Picture
setpictpenpos newpos=:{x=x`,y=y`} picture=:{pictToolbox,pictOrigin,pictPen=pen=:{penPos={x,y}},pictContext}
- | x==x` && y==y`
- = picture
- | otherwise
- # (context,tb) = winMovePenTo (toTuple (newpos-pictOrigin)) (pictContext,pictToolbox)
- pen = {pen & penPos={x=x`,y=y`}}
- = {picture & pictToolbox=tb,pictContext=context,pictPen=pen}
+ # (context,tb) = winMovePenTo (toTuple (newpos-pictOrigin)) (pictContext,pictToolbox)
+ pen = {pen & penPos={x=x`,y=y`}}
+ = {picture & pictToolbox=tb,pictContext=context,pictPen=pen}
getpictpenpos :: !*Picture -> (!Point2,!*Picture)
getpictpenpos picture=:{pictPen={penPos={x,y}}}
@@ -229,12 +226,9 @@ getpictpensize picture=:{pictPen={penSize}} // Change the PenColour:
setpictpencolour :: !Colour !*Picture -> *Picture
setpictpencolour colour picture=:{pictToolbox,pictPen,pictContext}
- //| reqRGB==curRGB
- // = picture
- //| otherwise
- # (context,tb) = winSetPenColor reqRGB (pictContext,pictToolbox)
- pen = {pictPen & penForeColour=colour}
- = {picture & pictPen=pen,pictToolbox=tb,pictContext=context}
+ # (context,tb) = winSetPenColor reqRGB (pictContext,pictToolbox)
+ pen = {pictPen & penForeColour=colour}
+ = {picture & pictPen=pen,pictToolbox=tb,pictContext=context}
where
reqRGB = toRGBtriple colour
curRGB = toRGBtriple pictPen.penForeColour
@@ -242,12 +236,9 @@ where from StdMisc import abort
setpictbackcolour :: !Colour !*Picture -> *Picture
setpictbackcolour colour picture=:{pictToolbox,pictPen,pictContext}
- //| reqRGB==curRGB
- // = picture
- //| otherwise
- # (context,tb) = winSetBackColor (toRGBtriple colour) (pictContext,pictToolbox)
- pen = {pictPen & penBackColour=colour}
- = {picture & pictPen=pen,pictToolbox=tb,pictContext=context}
+ # (context,tb) = winSetBackColor (toRGBtriple colour) (pictContext,pictToolbox)
+ pen = {pictPen & penBackColour=colour}
+ = {picture & pictPen=pen,pictToolbox=tb,pictContext=context}
where
reqRGB = toRGBtriple colour
curRGB = toRGBtriple pictPen.penBackColour
|