ui.gadgets.tables: some performance improvements.

diff --git a/basis/ui/gadgets/line-support/line-support.factor b/basis/ui/gadgets/line-support/line-support.factor
index c229c8c0757c9b4a3e3c70d1c53c6569a2a3e8fa..737cfc27647670b5d23d956ec1b0a68ce1b6c379 100644 (file)
--- a/basis/ui/gadgets/line-support/line-support.factor
+++ b/basis/ui/gadgets/line-support/line-support.factor
@@ -9,19 +9,39 @@ IN: ui.gadgets.line-support
 TUPLE: line-gadget < gadget
 font selection-color
 min-rows max-rows
-min-cols max-cols ;
+min-cols max-cols
+line-leading line-height
+pref-viewport-dim ;
 
 : new-line-gadget ( class -- gadget )
     new
         selection-color >>selection-color ;
 
+GENERIC: line-leading* ( gadget -- n )
+
+M: line-gadget line-leading* font>> font-metrics leading>> ;
+
 GENERIC: line-leading ( gadget -- n )
 
-M: line-gadget line-leading font>> font-metrics leading>> ;
+M: line-gadget line-leading
+    dup line-leading>>
+    [ ] [
+        [ line-leading* ] [ ] [ layout-state>> ] tri
+        [ drop ] [ dupd line-leading<< ] if
+    ] ?if ;
+
+GENERIC: line-height* ( gadget -- n )
+
+M: line-gadget line-height* font>> font-metrics height>> ceiling ;
 
 GENERIC: line-height ( gadget -- n )
 
-M: line-gadget line-height font>> font-metrics height>> ceiling ;
+M: line-gadget line-height
+    dup line-height>>
+    [ ] [
+        [ line-height* ] [ ] [ layout-state>> ] tri
+        [ drop ] [ dupd line-height<< ] if
+    ] ?if ;
 
 : y>line ( y gadget -- n ) line-height /i ;
 
@@ -78,11 +98,18 @@ PRIVATE>
 : line-gadget-height ( pref-dim gadget -- h )
     [ second ] [ [ line-height ] [ min-rows>> ] [ max-rows>> ] tri ] bi* clamp ;
 
-M: line-gadget pref-viewport-dim
+: pref-viewport-dim* ( gadget -- dim )
     [ pref-dim ] [ ] bi
     [ line-gadget-width ]
     [ line-gadget-height ]
-    2bi 2array ;
+    2bi 2array ; inline
+
+M: line-gadget pref-viewport-dim
+    dup pref-viewport-dim>>
+    [ ] [
+        [ pref-viewport-dim* ] [ ] [ layout-state>> ] tri
+        [ drop ] [ dupd pref-viewport-dim<< ] if
+    ] ?if ;
 
 : visible-lines ( gadget -- n )
     [ visible-dim second ] [ line-height ] bi /i ;

diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor
index 9f12eef3c3e562d771e7c62a1ccd87f245e99bea..aecdfa0b7b1b6a444dbb85e741ed82d0e4faec74 100644 (file)
--- a/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@ -49,7 +49,8 @@ selection-index
 selection
 mouse-index
 { takes-focus? initial: t }
-focused? ;
+focused?
+rows ;
 
 : new-table ( rows renderer class -- table )
     new-line-gadget
@@ -88,6 +89,9 @@ M: image-name draw-cell nip draw-image ;
 : table-rows ( table -- rows )
     [ control-value ] [ renderer>> ] bi '[ _ row-columns ] map ;
 
+: update-table-rows ( table -- )
+    [ table-rows ] [ rows<< ] bi ; inline
+
 : column-offsets ( widths gap -- x xs )
     [ 0 ] dip '[ _ + + ] accumulate ;
 
@@ -109,7 +113,7 @@ CONSTANT: column-title-background COLOR: light-gray
     swap [ column-offsets drop ] keep - ;
 
 : compute-column-widths ( table -- total widths )
-    dup table-rows [ drop 0 { } ] [
+    dup rows>> [ drop 0 { } ] [
         [ drop gap>> ] [ initial-widths ] [ ] 2tri
         [ row-column-widths vmax ] with each
         [ compute-total-width ] keep
@@ -131,7 +135,9 @@ CONSTANT: column-title-background COLOR: light-gray
     [ [ + ] change-nth ] [ 3drop ] if ;
 
 M: table layout*
-    [ update-cached-widths ] [ update-filled-column ] bi ;
+    [ update-table-rows ]
+    [ update-cached-widths ]
+    [ update-filled-column ] tri ;
 
 : row-rect ( table row -- rect )
     [ [ line-height ] dip * 0 swap 2array ]
@@ -225,7 +231,7 @@ M: table draw-gadget*
         ] with-variable
     ] if ;
 
-M: table line-height ( table -- y )
+M: table line-height* ( table -- y )
     [ font>> ] [ renderer>> prototype-row ] bi
     [ [ cell-height ] [ cell-padding ] bi + ] with
     [ max ] map-reduce ;
@@ -349,7 +355,7 @@ PRIVATE>
 : prev/next-row ( table n -- )
     [ dup selection-index>> value>> ] dip
     '[ _ + ] [ 0 ] if* select-row ;
-    
+
 : previous-row ( table -- )
     -1 prev/next-row ;
 

diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor
index 4e307a598450b7ff6f0463fca6c3c1e6758a3af9..bdf81fd9c982e389e0bcb6bfe6b4a2cb898d453d 100644 (file)
--- a/basis/ui/tools/common/common.factor
+++ b/basis/ui/tools/common/common.factor
@@ -12,14 +12,14 @@ tool-dims [ H{ } clone ] initialize
 TUPLE: tool < track ;
 
 M: tool pref-dim*
-    { [ class-of tool-dims get at ] [ call-next-method ] } 1|| ;
+    { [ class-of tool-dims get-global at ] [ call-next-method ] } 1|| ;
 
 M: tool layout*
     [ call-next-method ]
-    [ [ dim>> ] [ class-of ] bi tool-dims get set-at ]
+    [ [ dim>> ] [ class-of ] bi tool-dims get-global set-at ]
     bi ;
 
-: set-tool-dim ( dim class -- ) tool-dims get set-at ;
+: set-tool-dim ( dim class -- ) tool-dims get-global set-at ;
 
 SLOT: scroller