diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor index 61829e5936..7efbe9ca56 100755 --- a/extra/slides/slides.factor +++ b/extra/slides/slides.factor @@ -50,7 +50,7 @@ IN: slides T{ gradient f { { 0.25 0.25 0.25 1.0 } { 1.0 1.0 1.0 0.0 } } } over set-gadget-interior - { 800 10 } over set-gadget-dim + { 800 10 } over (>>dim) { 1 0 } over set-gadget-orientation gadget. ] ($block) ; diff --git a/extra/ui/cocoa/views/views.factor b/extra/ui/cocoa/views/views.factor index 3bacad20b4..1dcb62bcd9 100755 --- a/extra/ui/cocoa/views/views.factor +++ b/extra/ui/cocoa/views/views.factor @@ -338,7 +338,7 @@ CLASS: { { "updateFactorGadgetSize:" "void" { "id" "SEL" "id" } [ [ - 2drop dup view-dim swap window set-gadget-dim yield + 2drop dup view-dim swap window (>>dim) yield ] ui-try ] } diff --git a/extra/ui/gadgets/buttons/buttons.factor b/extra/ui/gadgets/buttons/buttons.factor index 8fa0e65a29..e9475495bf 100755 --- a/extra/ui/gadgets/buttons/buttons.factor +++ b/extra/ui/gadgets/buttons/buttons.factor @@ -126,7 +126,7 @@ M: checkmark-paint draw-interior : ( -- gadget ) dup checkmark-theme - { 14 14 } over set-gadget-dim ; + { 14 14 } over (>>dim) ; : toggle-model ( model -- ) [ not ] change-model ; @@ -172,7 +172,7 @@ M: radio-paint draw-boundary : ( -- gadget ) dup radio-knob-theme - { 16 16 } over set-gadget-dim ; + { 16 16 } over (>>dim) ; TUPLE: radio-control < button value ; diff --git a/extra/ui/ui.factor b/extra/ui/ui.factor index 6b7b3863eb..29d1d16642 100755 --- a/extra/ui/ui.factor +++ b/extra/ui/ui.factor @@ -4,7 +4,7 @@ USING: arrays assocs io kernel math models namespaces prettyprint dlists dequeues sequences threads sequences words debugger ui.gadgets ui.gadgets.worlds ui.gadgets.tracks ui.gestures ui.backend ui.render continuations init combinators -hashtables concurrency.flags sets ; +hashtables concurrency.flags sets accessors ; IN: ui ! Assoc mapping aliens to gadgets @@ -172,7 +172,7 @@ SYMBOL: ui-thread "UI update" spawn drop ; : open-world-window ( world -- ) - dup pref-dim over set-gadget-dim dup relayout graft ; + dup pref-dim over (>>dim) dup relayout graft ; : open-window ( gadget title -- ) f open-world-window ; diff --git a/extra/ui/windows/windows.factor b/extra/ui/windows/windows.factor index a210287439..44bfbf3877 100755 --- a/extra/ui/windows/windows.factor +++ b/extra/ui/windows/windows.factor @@ -93,7 +93,7 @@ SYMBOLS: msg-obj class-name-ptr mouse-captured ; : handle-wm-size ( hWnd uMsg wParam lParam -- ) 2nip [ lo-word ] keep hi-word 2array - dup { 0 0 } = [ 2drop ] [ swap window set-gadget-dim ] if ; + dup { 0 0 } = [ 2drop ] [ swap window (>>dim) ] if ; : handle-wm-move ( hWnd uMsg wParam lParam -- ) 2nip diff --git a/extra/ui/x11/x11.factor b/extra/ui/x11/x11.factor index b75daf89fa..b1ec3864a4 100755 --- a/extra/ui/x11/x11.factor +++ b/extra/ui/x11/x11.factor @@ -22,7 +22,7 @@ M: world expose-event nip relayout ; M: world configure-event over configured-loc over (>>window-loc) - swap configured-dim over set-gadget-dim + swap configured-dim over (>>dim) ! In case dimensions didn't change relayout-1 ;