diff --git a/basis/ui/tools/common/common.factor b/basis/ui/tools/common/common.factor index 6d40acbdd3..e581e72e24 100644 --- a/basis/ui/tools/common/common.factor +++ b/basis/ui/tools/common/common.factor @@ -1,7 +1,8 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs classes classes.mixin kernel namespaces -parser ui.gadgets ui.gadgets.scrollers ui.gadgets.tracks ; +parser ui.gadgets ui.gadgets.scrollers ui.gadgets.tracks +combinators.short-circuit ; IN: ui.tools.common SYMBOL: tool-dims @@ -11,7 +12,7 @@ tool-dims global [ H{ } clone or ] change-at TUPLE: tool < track ; M: tool pref-dim* - class tool-dims get at ; + { [ class tool-dims get at ] [ call-next-method ] } 1|| ; M: tool layout* [ call-next-method ] diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 29eafb1401..dfff7cbf42 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -12,8 +12,6 @@ IN: ui.tools.inspector TUPLE: inspector-gadget < tool table ; -{ 500 300 } inspector-gadget set-tool-dim - TUPLE: slot-description key key-string value value-string ; : ( key value -- slot-description ) @@ -65,7 +63,11 @@ M: hashtable make-slot-descriptions : ( model -- table ) [ make-slot-descriptions ] inspector-renderer [ dup primary-operation invoke-command ] >>action - monospace-font >>font ; + monospace-font >>font + 15 >>min-rows + 15 >>max-rows + 40 >>min-cols + 40 >>max-cols ; : ( model -- gadget ) vertical inspector-gadget new-track diff --git a/basis/ui/tools/profiler/profiler.factor b/basis/ui/tools/profiler/profiler.factor index 0e785303a4..71c931e7e5 100644 --- a/basis/ui/tools/profiler/profiler.factor +++ b/basis/ui/tools/profiler/profiler.factor @@ -20,8 +20,6 @@ words methods generic class ; -{ 700 400 } profiler-gadget set-tool-dim - SINGLETONS: word-renderer vocab-renderer ; UNION: profiler-renderer word-renderer vocab-renderer ; @@ -126,9 +124,13 @@ M: method-renderer column-titles drop { "Method" "Count" } ; { 3 3 } >>gap profiler vocabs>> vocab-renderer profiler vocab>> >>selected-value + 10 >>min-rows + 10 >>max-rows "Vocabularies" 1/2 track-add profiler word-renderer + 10 >>min-rows + 10 >>max-rows "Words" 1/2 track-add ; @@ -147,6 +149,9 @@ M: method-renderer column-titles drop { "Method" "Count" } ; 1/2 track-add 1/2 track-add profiler methods>> method-renderer + 5 >>min-rows + 5 >>max-rows + 40 >>min-cols "Methods" 1/2 track-add ;