From: Björn Lindqvist Date: Wed, 28 Jun 2017 12:25:38 +0000 (+0200) Subject: ui.tools: setting the initial tool dim as a multiple of the default font X-Git-Tag: 0.98~780 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=522eb559e469b97748430b64b84c0b8c9a1e43b1 ui.tools: setting the initial tool dim as a multiple of the default font --- diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index 232e367c1c..f4e556af56 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/basis/ui/tools/browser/browser.factor @@ -1,22 +1,20 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors arrays assocs classes colors.constants -combinators combinators.short-circuit compiler.units debugger -documents fry help help.apropos help.crossref help.home -help.markup help.stylesheet help.topics io.styles kernel locals -make models namespaces sequences sets ui ui.commands ui.gadgets -ui.gadgets.borders ui.gadgets.editors ui.gadgets.editors.private -ui.gadgets.glass ui.gadgets.labels ui.gadgets.labels.private -ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar -ui.theme ui.gadgets.toolbar ui.gadgets.tracks -ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid -ui.render ui.text ui.theme.images ui.tools.common -ui.tools.browser.history ui.tools.browser.popups unicode vocabs ; +USING: accessors arrays assocs classes combinators +combinators.short-circuit compiler.units debugger fonts fry help +help.apropos help.crossref help.home help.markup help.stylesheet +help.topics io.styles kernel locals make math.vectors models +namespaces sequences sets ui ui.commands ui.gadgets ui.gadgets.borders +ui.gadgets.editors ui.gadgets.glass ui.gadgets.panes +ui.gadgets.scrollers ui.gadgets.status-bar ui.gadgets.toolbar +ui.gadgets.tracks ui.gadgets.viewports ui.gadgets.worlds ui.gestures +ui.pens.solid ui.theme ui.tools.browser.history +ui.tools.browser.popups ui.tools.common unicode vocabs ; IN: ui.tools.browser TUPLE: browser-gadget < tool history scroller search-field popup ; -browser-gadget { 650 700 } set-tool-dim +browser-gadget default-font-size { 54 58 } n*v set-tool-dim M: browser-gadget history-value [ control-value ] [ scroller>> scroll-position ] diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 339e01c0a0..d6a3f54605 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -153,4 +153,4 @@ inspector-gadget "multi-touch" f { : inspector ( obj -- ) inspect-model ; -inspector-gadget { 550 400 } set-tool-dim +inspector-gadget default-font-size { 46 33 } n*v set-tool-dim diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index ad0be948c6..05858c28dc 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -1,17 +1,16 @@ ! Copyright (C) 2005, 2010 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors arrays assocs calendar combinators -combinators.short-circuit concurrency.flags -concurrency.mailboxes continuations destructors documents -documents.elements fonts fry hashtables help help.markup -help.tips io io.styles kernel lexer listener literals locals -math models models.arrow models.delay namespaces parser -prettyprint sequences source-files.errors strings system threads -tools.errors.model ui ui.commands ui.gadgets ui.gadgets.editors -ui.gadgets.glass ui.gadgets.labeled ui.gadgets.panes -ui.gadgets.scrollers ui.gadgets.status-bar ui.theme -ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.operations -ui.pens.solid ui.theme.images ui.tools.browser ui.tools.common +combinators.short-circuit concurrency.flags concurrency.mailboxes +continuations destructors documents documents.elements fonts fry +hashtables help help.markup help.tips io io.styles kernel lexer +listener literals locals math math.vectors models models.arrow +models.delay namespaces parser prettyprint sequences +source-files.errors strings system threads tools.errors.model ui +ui.commands ui.gadgets ui.gadgets.editors ui.gadgets.glass +ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers +ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks ui.gestures +ui.operations ui.pens.solid ui.theme ui.tools.browser ui.tools.common ui.tools.debugger ui.tools.error-list ui.tools.listener.completion ui.tools.listener.history ui.tools.listener.popups vocabs vocabs.loader vocabs.parser vocabs.refresh words ; @@ -192,7 +191,7 @@ M: interactor dispose drop ; TUPLE: listener-gadget < tool error-summary output scroller input ; -listener-gadget { 600 700 } set-tool-dim +listener-gadget default-font-size { 50 58 } n*v set-tool-dim : listener-streams ( listener -- input output ) [ input>> ] [ output>> ] bi ; diff --git a/extra/gopher/ui/ui.factor b/extra/gopher/ui/ui.factor index d75b15b67b..f60ad7e245 100644 --- a/extra/gopher/ui/ui.factor +++ b/extra/gopher/ui/ui.factor @@ -1,19 +1,18 @@ ! Copyright (C) 2014 John Benediktsson ! See http://factorcode.org/license.txt for BSD license -USING: accessors arrays debugger fry gopher gopher.private -kernel models present sequences ui ui.commands ui.gadgets -ui.gadgets.borders ui.gadgets.buttons ui.gadgets.editors -ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar -ui.gadgets.toolbar ui.gadgets.tracks ui.gadgets.viewports -ui.gestures ui.operations ui.tools.browser +USING: accessors arrays debugger fonts fry gopher gopher.private +kernel math.vectors models present sequences ui ui.commands ui.gadgets +ui.gadgets.editors ui.gadgets.panes ui.gadgets.scrollers +ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks +ui.gadgets.viewports ui.gestures ui.operations ui.tools.browser ui.tools.browser.history ui.tools.common urls ; IN: gopher.ui TUPLE: gopher-gadget < tool history scroller url-field ; -gopher-gadget { 600 600 } set-tool-dim +gopher-gadget default-font-size { 50 50 } n*v set-tool-dim M: gopher-gadget history-value [ control-value ] [ scroller>> scroll-position ]