diff --git a/basis/definitions/icons/class-predicate-word.png b/basis/definitions/icons/class-predicate-word.png index d70aa21412..f0f2aaeeff 100644 Binary files a/basis/definitions/icons/class-predicate-word.png and b/basis/definitions/icons/class-predicate-word.png differ diff --git a/basis/definitions/icons/class-word.png b/basis/definitions/icons/class-word.png index a137690333..35395921ac 100644 Binary files a/basis/definitions/icons/class-word.png and b/basis/definitions/icons/class-word.png differ diff --git a/basis/definitions/icons/constant-word.png b/basis/definitions/icons/constant-word.png index 2b265e00aa..98f696fb8d 100644 Binary files a/basis/definitions/icons/constant-word.png and b/basis/definitions/icons/constant-word.png differ diff --git a/basis/definitions/icons/generic-word.png b/basis/definitions/icons/generic-word.png index e260cc55a5..ba323d0600 100644 Binary files a/basis/definitions/icons/generic-word.png and b/basis/definitions/icons/generic-word.png differ diff --git a/basis/definitions/icons/help-article.png b/basis/definitions/icons/help-article.png index ce35018a0e..6b49a74cd7 100644 Binary files a/basis/definitions/icons/help-article.png and b/basis/definitions/icons/help-article.png differ diff --git a/basis/definitions/icons/macro-word.png b/basis/definitions/icons/macro-word.png index 1c6f0f3947..f0f0404f38 100644 Binary files a/basis/definitions/icons/macro-word.png and b/basis/definitions/icons/macro-word.png differ diff --git a/basis/definitions/icons/normal-word.png b/basis/definitions/icons/normal-word.png index 27966b4971..e5ecfc7597 100644 Binary files a/basis/definitions/icons/normal-word.png and b/basis/definitions/icons/normal-word.png differ diff --git a/basis/definitions/icons/open-vocab.png b/basis/definitions/icons/open-vocab.png index 6f6b3cb87c..ac805afd99 100644 Binary files a/basis/definitions/icons/open-vocab.png and b/basis/definitions/icons/open-vocab.png differ diff --git a/basis/definitions/icons/parsing-word.png b/basis/definitions/icons/parsing-word.png index eabb381b20..a6384d9dd9 100644 Binary files a/basis/definitions/icons/parsing-word.png and b/basis/definitions/icons/parsing-word.png differ diff --git a/basis/definitions/icons/primitive-word.png b/basis/definitions/icons/primitive-word.png index 2952a0b921..ca95b73c71 100644 Binary files a/basis/definitions/icons/primitive-word.png and b/basis/definitions/icons/primitive-word.png differ diff --git a/basis/definitions/icons/runnable-vocab.png b/basis/definitions/icons/runnable-vocab.png index c028bf28e1..bc76f74d28 100644 Binary files a/basis/definitions/icons/runnable-vocab.png and b/basis/definitions/icons/runnable-vocab.png differ diff --git a/basis/definitions/icons/symbol-word.png b/basis/definitions/icons/symbol-word.png index 6f0c267c96..754681d2cc 100644 Binary files a/basis/definitions/icons/symbol-word.png and b/basis/definitions/icons/symbol-word.png differ diff --git a/basis/definitions/icons/unopen-vocab.png b/basis/definitions/icons/unopen-vocab.png index 05ca4a4682..c9f5790f3e 100644 Binary files a/basis/definitions/icons/unopen-vocab.png and b/basis/definitions/icons/unopen-vocab.png differ diff --git a/basis/definitions/icons/word-help-article.png b/basis/definitions/icons/word-help-article.png index 141d390e20..2e8532a619 100644 Binary files a/basis/definitions/icons/word-help-article.png and b/basis/definitions/icons/word-help-article.png differ diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor index 163af6fbc7..f875a4be57 100644 --- a/basis/ui/images/images.factor +++ b/basis/ui/images/images.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs cache combinators images.loader kernel -memoize namespaces opengl.textures sequences system +math memoize namespaces opengl.textures sequences system ui.gadgets.worlds vocabs ; IN: ui.images @@ -9,7 +9,8 @@ TUPLE: image-name path ; C: image-name -MEMO: cached-image ( image-name -- image ) path>> load-image ; +MEMO: cached-image ( image-name -- image ) + path>> load-image t >>2x? ; rendered-image draw-scaled-texture ; : image-dim ( image-name -- dim ) - cached-image dim>> ; + cached-image dim>> [ 2 / ] map ; { { [ os macosx? ] [ "images.loader.cocoa" require ] } diff --git a/basis/ui/theme/images/active-tab-left.tiff b/basis/ui/theme/images/active-tab-left.tiff index 8a6c05f99d..6413b3099b 100644 Binary files a/basis/ui/theme/images/active-tab-left.tiff and b/basis/ui/theme/images/active-tab-left.tiff differ diff --git a/basis/ui/theme/images/active-tab-lip.tiff b/basis/ui/theme/images/active-tab-lip.tiff index 8ff803f03a..0565620f28 100644 Binary files a/basis/ui/theme/images/active-tab-lip.tiff and b/basis/ui/theme/images/active-tab-lip.tiff differ diff --git a/basis/ui/theme/images/active-tab-middle.tiff b/basis/ui/theme/images/active-tab-middle.tiff index 0f40e93a75..ed2655f244 100644 Binary files a/basis/ui/theme/images/active-tab-middle.tiff and b/basis/ui/theme/images/active-tab-middle.tiff differ diff --git a/basis/ui/theme/images/active-tab-right.tiff b/basis/ui/theme/images/active-tab-right.tiff index b56dc0172c..3670f0585d 100644 Binary files a/basis/ui/theme/images/active-tab-right.tiff and b/basis/ui/theme/images/active-tab-right.tiff differ diff --git a/basis/ui/theme/images/button-clicked-left.tiff b/basis/ui/theme/images/button-clicked-left.tiff index ad85bf15a8..203ce2492e 100644 Binary files a/basis/ui/theme/images/button-clicked-left.tiff and b/basis/ui/theme/images/button-clicked-left.tiff differ diff --git a/basis/ui/theme/images/button-clicked-middle.tiff b/basis/ui/theme/images/button-clicked-middle.tiff index 4573006a6d..a9348ef574 100644 Binary files a/basis/ui/theme/images/button-clicked-middle.tiff and b/basis/ui/theme/images/button-clicked-middle.tiff differ diff --git a/basis/ui/theme/images/button-clicked-right.tiff b/basis/ui/theme/images/button-clicked-right.tiff index ee70645420..fbc83a9831 100644 Binary files a/basis/ui/theme/images/button-clicked-right.tiff and b/basis/ui/theme/images/button-clicked-right.tiff differ diff --git a/basis/ui/theme/images/button-left.tiff b/basis/ui/theme/images/button-left.tiff index dba2fc4ec7..44d9c5fb57 100644 Binary files a/basis/ui/theme/images/button-left.tiff and b/basis/ui/theme/images/button-left.tiff differ diff --git a/basis/ui/theme/images/button-middle.tiff b/basis/ui/theme/images/button-middle.tiff index 0c6c353331..0d2046809e 100644 Binary files a/basis/ui/theme/images/button-middle.tiff and b/basis/ui/theme/images/button-middle.tiff differ diff --git a/basis/ui/theme/images/button-right.tiff b/basis/ui/theme/images/button-right.tiff index aaff61e0bb..29029aa1c5 100644 Binary files a/basis/ui/theme/images/button-right.tiff and b/basis/ui/theme/images/button-right.tiff differ diff --git a/basis/ui/theme/images/checkbox-clicked.tiff b/basis/ui/theme/images/checkbox-clicked.tiff index 57026d4e20..f491fe39ba 100644 Binary files a/basis/ui/theme/images/checkbox-clicked.tiff and b/basis/ui/theme/images/checkbox-clicked.tiff differ diff --git a/basis/ui/theme/images/checkbox-set-clicked.tiff b/basis/ui/theme/images/checkbox-set-clicked.tiff index b8d5ce5340..dc2f7ea2ea 100644 Binary files a/basis/ui/theme/images/checkbox-set-clicked.tiff and b/basis/ui/theme/images/checkbox-set-clicked.tiff differ diff --git a/basis/ui/theme/images/checkbox-set.tiff b/basis/ui/theme/images/checkbox-set.tiff index 6f737a77d2..8d196d6616 100644 Binary files a/basis/ui/theme/images/checkbox-set.tiff and b/basis/ui/theme/images/checkbox-set.tiff differ diff --git a/basis/ui/theme/images/checkbox.tiff b/basis/ui/theme/images/checkbox.tiff index 570d9e4db3..754ad86e03 100644 Binary files a/basis/ui/theme/images/checkbox.tiff and b/basis/ui/theme/images/checkbox.tiff differ diff --git a/basis/ui/theme/images/clear-button-clicked.tiff b/basis/ui/theme/images/clear-button-clicked.tiff index 52e0e4ad2c..42f7893ee1 100644 Binary files a/basis/ui/theme/images/clear-button-clicked.tiff and b/basis/ui/theme/images/clear-button-clicked.tiff differ diff --git a/basis/ui/theme/images/clear-button.tiff b/basis/ui/theme/images/clear-button.tiff index 5e66e3914e..a2039faa43 100644 Binary files a/basis/ui/theme/images/clear-button.tiff and b/basis/ui/theme/images/clear-button.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff b/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff index 3d7bd5ec1d..e3ce95a923 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff and b/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-handle-left.tiff b/basis/ui/theme/images/horizontal-scroller-handle-left.tiff index 1870426429..03f66291cd 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-handle-left.tiff and b/basis/ui/theme/images/horizontal-scroller-handle-left.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff b/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff index 1b28ba4de8..dfdcc68fe1 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff and b/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-handle-right.tiff b/basis/ui/theme/images/horizontal-scroller-handle-right.tiff index 2590b00f8a..8c006a8199 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-handle-right.tiff and b/basis/ui/theme/images/horizontal-scroller-handle-right.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-left.tiff b/basis/ui/theme/images/horizontal-scroller-left.tiff index 0a03caae93..bc0c9eb9d3 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-left.tiff and b/basis/ui/theme/images/horizontal-scroller-left.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff index 311be256ca..2d1374cf56 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff and b/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-middle.tiff b/basis/ui/theme/images/horizontal-scroller-middle.tiff index 22bb1be222..7034957b86 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-middle.tiff and b/basis/ui/theme/images/horizontal-scroller-middle.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff b/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff index ccf31bf523..28eed8597c 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff and b/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-right.tiff b/basis/ui/theme/images/horizontal-scroller-right.tiff index 4aebabada4..099c151423 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-right.tiff and b/basis/ui/theme/images/horizontal-scroller-right.tiff differ diff --git a/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff index 0efc9aebf1..c47bc3cc81 100644 Binary files a/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff and b/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff differ diff --git a/basis/ui/theme/images/inactive-tab-left.tiff b/basis/ui/theme/images/inactive-tab-left.tiff index 164c008aea..fb463ad248 100644 Binary files a/basis/ui/theme/images/inactive-tab-left.tiff and b/basis/ui/theme/images/inactive-tab-left.tiff differ diff --git a/basis/ui/theme/images/inactive-tab-middle.tiff b/basis/ui/theme/images/inactive-tab-middle.tiff index 3bdff5c30a..c91eda3177 100644 Binary files a/basis/ui/theme/images/inactive-tab-middle.tiff and b/basis/ui/theme/images/inactive-tab-middle.tiff differ diff --git a/basis/ui/theme/images/inactive-tab-right.tiff b/basis/ui/theme/images/inactive-tab-right.tiff index c0ddac6b0d..b73f599990 100644 Binary files a/basis/ui/theme/images/inactive-tab-right.tiff and b/basis/ui/theme/images/inactive-tab-right.tiff differ diff --git a/basis/ui/theme/images/radio-clicked.tiff b/basis/ui/theme/images/radio-clicked.tiff index 3092f8bb8d..ddf68d3b4f 100644 Binary files a/basis/ui/theme/images/radio-clicked.tiff and b/basis/ui/theme/images/radio-clicked.tiff differ diff --git a/basis/ui/theme/images/radio-set-clicked.tiff b/basis/ui/theme/images/radio-set-clicked.tiff index 21b2813a41..a605a72a02 100644 Binary files a/basis/ui/theme/images/radio-set-clicked.tiff and b/basis/ui/theme/images/radio-set-clicked.tiff differ diff --git a/basis/ui/theme/images/radio-set.tiff b/basis/ui/theme/images/radio-set.tiff index 291b464e5a..f69e1e38d7 100644 Binary files a/basis/ui/theme/images/radio-set.tiff and b/basis/ui/theme/images/radio-set.tiff differ diff --git a/basis/ui/theme/images/radio.tiff b/basis/ui/theme/images/radio.tiff index 34944437b2..9294bd943b 100644 Binary files a/basis/ui/theme/images/radio.tiff and b/basis/ui/theme/images/radio.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff b/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff index ea7e118d86..36b0461569 100644 Binary files a/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff and b/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-bottom.tiff b/basis/ui/theme/images/vertical-scroller-bottom.tiff index 17eb84c5ec..ffe8071240 100644 Binary files a/basis/ui/theme/images/vertical-scroller-bottom.tiff and b/basis/ui/theme/images/vertical-scroller-bottom.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff index 8a06d05967..1bb60f4e7c 100644 Binary files a/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff and b/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff b/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff index 1151cfc873..66bd2b6ee4 100644 Binary files a/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff and b/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-handle-grip.tiff b/basis/ui/theme/images/vertical-scroller-handle-grip.tiff index 6bb514c2e8..6d333241b6 100644 Binary files a/basis/ui/theme/images/vertical-scroller-handle-grip.tiff and b/basis/ui/theme/images/vertical-scroller-handle-grip.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-handle-middle.tiff b/basis/ui/theme/images/vertical-scroller-handle-middle.tiff index cac14e0fb6..c6701eeaff 100644 Binary files a/basis/ui/theme/images/vertical-scroller-handle-middle.tiff and b/basis/ui/theme/images/vertical-scroller-handle-middle.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-handle-top.tiff b/basis/ui/theme/images/vertical-scroller-handle-top.tiff index 4f982a8d5a..ac6e5422bf 100644 Binary files a/basis/ui/theme/images/vertical-scroller-handle-top.tiff and b/basis/ui/theme/images/vertical-scroller-handle-top.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-middle.tiff b/basis/ui/theme/images/vertical-scroller-middle.tiff index 5d759a18d7..b188d60aa2 100644 Binary files a/basis/ui/theme/images/vertical-scroller-middle.tiff and b/basis/ui/theme/images/vertical-scroller-middle.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-top.tiff b/basis/ui/theme/images/vertical-scroller-top.tiff index f271136a05..11b1410410 100644 Binary files a/basis/ui/theme/images/vertical-scroller-top.tiff and b/basis/ui/theme/images/vertical-scroller-top.tiff differ diff --git a/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff index 4ee2ef4b12..63119018aa 100644 Binary files a/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff and b/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff differ