steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui.gadgets: formatting.

master
John Benediktsson 2020-05-16 10:07:35 -07:00
parent 33e72abff9
commit b3412e8930
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/ui/gadgets/borders/borders.factor
View File

@ -5,10 +5,10 @@ sequences ui.baseline-alignment ui.gadgets ;
IN: ui.gadgets.borders IN: ui.gadgets.borders
TUPLE: border < aligned-gadget TUPLE: border < aligned-gadget
{ size initial: { 0 0 } } { size initial: { 0 0 } }
{ fill initial: { 0 0 } } { fill initial: { 0 0 } }
{ align initial: { 1/2 1/2 } } { align initial: { 1/2 1/2 } }
{ min-dim initial: { 0 0 } } ; { min-dim initial: { 0 0 } } ;
: new-border ( child class -- border ) : new-border ( child class -- border )
new swap add-gadget ; inline new swap add-gadget ; inline

4
basis/ui/gadgets/editors/editors.factor
View File

@ -178,10 +178,10 @@ M: editor ungraft*
editor [ caret-loc second ] [ caret-dim second ] bi + 2.0 - :> y editor [ caret-loc second ] [ caret-dim second ] bi + 2.0 - :> y
editor editor-caret first :> row editor editor-caret first :> row
editor font>> foreground>> gl-color editor font>> foreground>> gl-color
editor preedit-underlines>> [ editor preedit-underlines>> [
GL_LINE_BIT [ GL_LINE_BIT [
dup second glLineWidth dup second glLineWidth
first editor preedit-start>> second dup 2array v+ first2 first editor preedit-start>> second dup 2array v+ first2
[ row swap 2array editor loc>x 1.0 + y 2array ] [ row swap 2array editor loc>x 1.0 + y 2array ]
[ row swap 2array editor loc>x 1.0 - y 2array ] [ row swap 2array editor loc>x 1.0 - y 2array ]
bi* bi*

6
basis/ui/gadgets/line-support/line-support.factor
View File

@ -19,7 +19,8 @@ TUPLE: line-gadget < gadget
GENERIC: line-leading* ( gadget -- n ) GENERIC: line-leading* ( gadget -- n )
M: line-gadget line-leading* font>> font-metrics leading>> ; M: line-gadget line-leading*
font>> font-metrics leading>> ;
GENERIC: line-leading ( gadget -- n ) GENERIC: line-leading ( gadget -- n )
@ -32,7 +33,8 @@ M: line-gadget line-leading
GENERIC: line-height* ( gadget -- n ) GENERIC: line-height* ( gadget -- n )
M: line-gadget line-height* font>> font-metrics height>> ceiling ; M: line-gadget line-height*
font>> font-metrics height>> ceiling >integer ;
GENERIC: line-height ( gadget -- n ) GENERIC: line-height ( gadget -- n )

4
basis/ui/gadgets/packs/packs.factor
View File

@ -6,7 +6,9 @@ ui.baseline-alignment.private ui.gadgets ;
IN: ui.gadgets.packs IN: ui.gadgets.packs
TUPLE: pack < aligned-gadget TUPLE: pack < aligned-gadget
{ align initial: 0 } { fill initial: 0 } { gap initial: { 0 0 } } ; { align initial: 0 }
{ fill initial: 0 }
{ gap initial: { 0 0 } } ;
<PRIVATE <PRIVATE