diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index d3d674a8a..1e48c66d8 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -217,7 +217,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); [self unsetThemeState:CPThemeStateScrollViewLegacy]; } - [self _adjustScrollerSize]; + //[self _adjustScrollerSize]; } - (void)setObjectValue:(id)aValue @@ -523,6 +523,7 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); - (void)layoutSubviews { + [self _adjustScrollerSize]; [self checkSpaceForParts]; var index = 0, diff --git a/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png b/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png new file mode 100644 index 000000000..d9d97f73e Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/Aristo-11-06-07_283.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-center.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-center.png index c8a6e89b6..d0ff312bc 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-left.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-left.png index 41450265c..0a2546d90 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-right.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-right.png index 5e273fa67..8dfa79344 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-bottom-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-center.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-center.png index aa15c2c3a..ba7b70f54 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-left.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-left.png index 743ad476a..50f02deb3 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-right.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-right.png index 8d2ea7f21..940ca661d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-center-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-center.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-center.png index e6cc1eec9..212ae6d73 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-center.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-left.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-left.png index f33dc5714..43a185695 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-left.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-right.png b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-right.png index 204c8056f..e46fba875 100644 Binary files a/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-right.png and b/AppKit/Themes/Aristo2/Resources/HUD/window-bezel-top-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/alert-warning.png b/AppKit/Themes/Aristo2/Resources/alert-warning.png index 03dcc2f83..3e5fb46c6 100755 Binary files a/AppKit/Themes/Aristo2/Resources/alert-warning.png and b/AppKit/Themes/Aristo2/Resources/alert-warning.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-center.png b/AppKit/Themes/Aristo2/Resources/button-bezel-center.png index 382522ffa..9d79acb0e 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-center.png index 382522ffa..c6dacde14 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-left.png index 03086c31b..e2c7a08eb 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-right.png index 64ae24d07..b6a02fd37 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-center.png index 8227cb037..f04a0a714 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-left.png index 003c9314f..c50be6508 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-right.png index 8847d872a..ce5f76af0 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-left.png b/AppKit/Themes/Aristo2/Resources/button-bezel-left.png index 03086c31b..4f644a466 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/button-bezel-right.png b/AppKit/Themes/Aristo2/Resources/button-bezel-right.png index 64ae24d07..a8ecfbcf5 100755 Binary files a/AppKit/Themes/Aristo2/Resources/button-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/button-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-disabled.png b/AppKit/Themes/Aristo2/Resources/check-box-image-disabled.png index f1ee6476a..04e3c5d24 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-disabled.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-highlighted.png b/AppKit/Themes/Aristo2/Resources/check-box-image-highlighted.png index d3223d83f..65a8ce2e0 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-highlighted.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-disabled.png b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-disabled.png index a90d28d5f..abbc758a6 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-disabled.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-highlighted.png b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-highlighted.png index a0102e0fb..b0f1be440 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-highlighted.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed.png b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed.png index ffc735e27..daac3e76b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-mixed.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-mixed.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-selected-disabled.png b/AppKit/Themes/Aristo2/Resources/check-box-image-selected-disabled.png index 959268935..6e0d3d005 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-selected-disabled.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-selected-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-selected-highlighted.png b/AppKit/Themes/Aristo2/Resources/check-box-image-selected-highlighted.png index 2e6e76206..73c40f914 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-selected-highlighted.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-selected-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image-selected.png b/AppKit/Themes/Aristo2/Resources/check-box-image-selected.png index 0d13614ed..c425fefdb 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image-selected.png and b/AppKit/Themes/Aristo2/Resources/check-box-image-selected.png differ diff --git a/AppKit/Themes/Aristo2/Resources/check-box-image.png b/AppKit/Themes/Aristo2/Resources/check-box-image.png index e004f17c7..c695006dd 100644 Binary files a/AppKit/Themes/Aristo2/Resources/check-box-image.png and b/AppKit/Themes/Aristo2/Resources/check-box-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-center.png index 24ba8d0a5..3d5e3afd8 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-center.png index ea9901b0c..01a36d105 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-left.png index d2be9689b..29926a9c4 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-right.png index 9fb4eb206..60ba45e14 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-center.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-center.png index c7c7e8bd8..fae23646d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-center.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-left.png index 1bd62f74b..10dcf8e00 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-right.png index 1eb975b1d..ad0e23f30 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-focused-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-left.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-left.png index f60e15516..c7a6b409d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/combobox-bezel-right.png b/AppKit/Themes/Aristo2/Resources/combobox-bezel-right.png index c2ac31adf..60b06507a 100644 Binary files a/AppKit/Themes/Aristo2/Resources/combobox-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/combobox-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-center.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-center.png index 952275ce5..81442a682 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-center.png index 382522ffa..3e9c84659 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-left.png index 03086c31b..998887ba0 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-right.png index 64ae24d07..ba684c46d 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-center.png index 9e5a44d55..5142827bb 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-left.png index a595c9e58..88e0fa210 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-right.png index c646698cd..cb3b2b681 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-left.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-left.png index 3924dcc93..71f261536 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/default-button-bezel-right.png b/AppKit/Themes/Aristo2/Resources/default-button-bezel-right.png index e76798b9b..39d1167b7 100755 Binary files a/AppKit/Themes/Aristo2/Resources/default-button-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/default-button-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/horizontal-track-center.png index 23c9c4a04..adede5109 100755 Binary files a/AppKit/Themes/Aristo2/Resources/horizontal-track-center.png and b/AppKit/Themes/Aristo2/Resources/horizontal-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/horizontal-track-left.png b/AppKit/Themes/Aristo2/Resources/horizontal-track-left.png index d317e48c3..3fc250337 100755 Binary files a/AppKit/Themes/Aristo2/Resources/horizontal-track-left.png and b/AppKit/Themes/Aristo2/Resources/horizontal-track-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/horizontal-track-right.png b/AppKit/Themes/Aristo2/Resources/horizontal-track-right.png index d38e76d4d..321c82990 100755 Binary files a/AppKit/Themes/Aristo2/Resources/horizontal-track-right.png and b/AppKit/Themes/Aristo2/Resources/horizontal-track-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/knob-highlighted.png b/AppKit/Themes/Aristo2/Resources/knob-highlighted.png index dbd779fd3..e916d66e2 100755 Binary files a/AppKit/Themes/Aristo2/Resources/knob-highlighted.png and b/AppKit/Themes/Aristo2/Resources/knob-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/knob.png b/AppKit/Themes/Aristo2/Resources/knob.png index d30e7af0d..5a287f23d 100755 Binary files a/AppKit/Themes/Aristo2/Resources/knob.png and b/AppKit/Themes/Aristo2/Resources/knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-center.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-center.png index 382522ffa..b9a90d257 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-center.png index 382522ffa..d670e5403 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-left.png index 03086c31b..c40f1b9be 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right-pullsdown.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right-pullsdown.png index df839eac4..ef66cca6f 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right-pullsdown.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right-pullsdown.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right.png index 309719163..2fa4ed4a9 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-left.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-left.png index 03086c31b..ab5d17e54 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-right-pullsdown.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-right-pullsdown.png index 7e3b4f773..1856a9837 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-right-pullsdown.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-right-pullsdown.png differ diff --git a/AppKit/Themes/Aristo2/Resources/popup-bezel-right.png b/AppKit/Themes/Aristo2/Resources/popup-bezel-right.png index 0b4437e56..da0d24dea 100755 Binary files a/AppKit/Themes/Aristo2/Resources/popup-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/popup-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-center.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-center.png index 952275ce5..8f0302e7c 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-center.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-left.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-left.png index 5bcae297e..1147a36ba 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-left.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-right.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-right.png index 5bcae297e..f2380f881 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-right.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bar-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-center.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-center.png index 382522ffa..43f7bd498 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-center.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-left.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-left.png index 3fc65c1c2..2ae0f4e18 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-left.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-right.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-right.png index 3fc65c1c2..287154773 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-right.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-bezel-border-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-center.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-center.png index 31aa438fa..1a80740c2 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-center.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-left.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-left.png index 5bcae297e..3794c5cc9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-left.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-right.png b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-right.png index 5bcae297e..d2e0a113d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-right.png and b/AppKit/Themes/Aristo2/Resources/progress-indicator-inderterminate-bar-bar-regular-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image-disabled.png b/AppKit/Themes/Aristo2/Resources/radio-image-disabled.png index 7513c7ad6..628081b39 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image-disabled.png and b/AppKit/Themes/Aristo2/Resources/radio-image-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image-highlighted.png b/AppKit/Themes/Aristo2/Resources/radio-image-highlighted.png index 5967b2dfb..39ca66313 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image-highlighted.png and b/AppKit/Themes/Aristo2/Resources/radio-image-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image-selected-disabled.png b/AppKit/Themes/Aristo2/Resources/radio-image-selected-disabled.png index 413c21237..00dd32493 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image-selected-disabled.png and b/AppKit/Themes/Aristo2/Resources/radio-image-selected-disabled.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image-selected-highlighted.png b/AppKit/Themes/Aristo2/Resources/radio-image-selected-highlighted.png index bd6771a87..c4890a389 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image-selected-highlighted.png and b/AppKit/Themes/Aristo2/Resources/radio-image-selected-highlighted.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image-selected.png b/AppKit/Themes/Aristo2/Resources/radio-image-selected.png index 05235e70d..68dad2510 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image-selected.png and b/AppKit/Themes/Aristo2/Resources/radio-image-selected.png differ diff --git a/AppKit/Themes/Aristo2/Resources/radio-image.png b/AppKit/Themes/Aristo2/Resources/radio-image.png index f0f5b6442..8684e6cd9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/radio-image.png and b/AppKit/Themes/Aristo2/Resources/radio-image.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-center.png index 6391d914f..d309c9d77 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-center.png and b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-left.png b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-left.png index b3cf74d68..28b8fdb4b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-left.png and b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-right.png b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-right.png index 019855a60..8d83c588b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-right.png and b/AppKit/Themes/Aristo2/Resources/scroller-horizontal-track-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png index cadda610c..204893516 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png index 04e2510a6..f8f8df69b 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png index 5a9e6c8b1..af21a134d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-horizontal-track-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png index 51517a659..8669fe040 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-bottom.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png index b5afcbb9d..9a59d352e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png index c41a4afb2..b0043c515 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png and b/AppKit/Themes/Aristo2/Resources/scroller-legacy-vertical-track-top.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-bottom.png b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-bottom.png index 92a2fe6be..a613b4173 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-bottom.png and b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-bottom.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-center.png b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-center.png index 9e74fdb51..ba31b58a3 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-center.png and b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-top.png b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-top.png index e6f8123d8..7876d6e17 100644 Binary files a/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-top.png and b/AppKit/Themes/Aristo2/Resources/scroller-vertical-track-top.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-center.png index 382522ffa..3c133bf22 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-center.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-divider.png index 6dc98f794..6085f6db3 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-divider.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-center.png index 952275ce5..912ab4323 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-center.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-divider.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-divider.png index 8a8c22dfe..ed1fc8cba 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-divider.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-divider.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-left.png index 35b0e1911..c45e214fc 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-left.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-right.png index e76798b9b..5341a07d8 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-right.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-highlighted-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-left.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-left.png index 03086c31b..a8001d3bd 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-left.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-right.png b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-right.png index 64ae24d07..3f8ce1150 100755 Binary files a/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-right.png and b/AppKit/Themes/Aristo2/Resources/segmented-control-bezel-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/slider-circular-bezel.png b/AppKit/Themes/Aristo2/Resources/slider-circular-bezel.png index 8d69327dd..d99624bd3 100755 Binary files a/AppKit/Themes/Aristo2/Resources/slider-circular-bezel.png and b/AppKit/Themes/Aristo2/Resources/slider-circular-bezel.png differ diff --git a/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-bezel.png b/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-bezel.png index 538040b9b..c7481de70 100755 Binary files a/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-bezel.png and b/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-bezel.png differ diff --git a/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-knob.png b/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-knob.png index 0730bbee7..cd25d7b06 100755 Binary files a/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-knob.png and b/AppKit/Themes/Aristo2/Resources/slider-circular-disabled-knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/slider-circular-knob.png b/AppKit/Themes/Aristo2/Resources/slider-circular-knob.png index 96f97c451..786cf98ee 100755 Binary files a/AppKit/Themes/Aristo2/Resources/slider-circular-knob.png and b/AppKit/Themes/Aristo2/Resources/slider-circular-knob.png differ diff --git a/AppKit/Themes/Aristo2/Resources/tableview-headerview.png b/AppKit/Themes/Aristo2/Resources/tableview-headerview.png index 4a0efdcda..d44b3135a 100644 Binary files a/AppKit/Themes/Aristo2/Resources/tableview-headerview.png and b/AppKit/Themes/Aristo2/Resources/tableview-headerview.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-106.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-106.png new file mode 100644 index 000000000..b1db5ac92 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-106.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-107.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-107.png new file mode 100644 index 000000000..1fe7303df Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-107.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-110.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-110.png new file mode 100644 index 000000000..fb6daf4f7 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-110.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-111.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-111.png new file mode 100644 index 000000000..f89ed0dd6 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-111.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-113.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-113.png new file mode 100644 index 000000000..d2af99824 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-113.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-114.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-114.png new file mode 100644 index 000000000..915e7ba3b Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center-114.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center.png old mode 100755 new mode 100644 index b689e4c57..9cf642a71 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png index f5d8de4c2..d88cfb459 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png index 4ec53b31b..7dd6fa8e1 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png index 152acfd72..50846d1e7 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-center.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-center.png index 0260c020f..3a8d61e96 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-center.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-left.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-left.png index 2b5301955..2247a6249 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-left.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-right.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-right.png index 93a71c200..a81a4582d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-right.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-focused-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-left.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-left.png index 8ac271888..ca719da0a 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-left.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-right.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-right.png index 0b058e241..3c191f2d0 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-right.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-0.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-0.png index eb1f358e6..2524f6c9a 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-0.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-0.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-1.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-1.png index 82b50e14a..6cf8b8726 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-1.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-1.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-2.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-2.png index a7a96c673..6a7663cfb 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-2.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-2.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-3.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-3.png index be6dcbc66..4d9d7ea9a 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-3.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-3.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-4.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-4.png index 4996c1820..5ea048921 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-4.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-4.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-5.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-5.png index 51f12b3ff..ed8bedfa4 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-5.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-5.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-6.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-6.png index b4db1ef5a..48f5c2281 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-6.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-6.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-7.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-7.png index 03ed6bdff..939f9addc 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-7.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-7.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-8.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-8.png index c1ecbf712..2269219f5 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-8.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-8.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-0.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-0.png index afc78bb1b..754be5987 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-0.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-0.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-1.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-1.png index 5c3289e8d..a2911cd2a 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-1.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-1.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-2.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-2.png index 165220624..38a217b3e 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-2.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-2.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-3.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-3.png index ef434b0a4..83e0b6886 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-3.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-3.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-4.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-4.png index 4996c1820..b8559d75e 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-4.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-4.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-5.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-5.png index 32f3d0218..cafef4232 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-5.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-5.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-6.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-6.png index f5f35a738..4d3d62dc1 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-6.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-6.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-7.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-7.png index 79183c456..8bfc09432 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-7.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-7.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-8.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-8.png index 36d2ff30a..ddca31117 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-8.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-disabled-8.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-0.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-0.png index d37048f5f..6d64d1bd3 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-0.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-0.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-1.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-1.png index 195ba83fc..4f17d46d8 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-1.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-1.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-2.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-2.png index dbd810484..428de7d44 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-2.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-2.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-3.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-3.png index f5d46955e..8a69fe112 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-3.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-3.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-4.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-4.png index 4996c1820..75ff52cf8 100755 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-4.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-4.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-5.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-5.png index 32c945231..7a7e20a92 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-5.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-5.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-6.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-6.png index c2e426958..a74a5bae8 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-6.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-6.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-7.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-7.png index 59246599a..b5df25bdb 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-7.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-7.png differ diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-8.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-8.png index 91f082a9b..682dd4686 100644 Binary files a/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-8.png and b/AppKit/Themes/Aristo2/Resources/textfield-bezel-square-focused-8.png differ diff --git a/AppKit/Themes/Aristo2/Resources/vertical-track-bottom.png b/AppKit/Themes/Aristo2/Resources/vertical-track-bottom.png index 9de77f4bc..df467b72c 100755 Binary files a/AppKit/Themes/Aristo2/Resources/vertical-track-bottom.png and b/AppKit/Themes/Aristo2/Resources/vertical-track-bottom.png differ diff --git a/AppKit/Themes/Aristo2/Resources/vertical-track-center.png b/AppKit/Themes/Aristo2/Resources/vertical-track-center.png index e6742bb3b..632640595 100755 Binary files a/AppKit/Themes/Aristo2/Resources/vertical-track-center.png and b/AppKit/Themes/Aristo2/Resources/vertical-track-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/vertical-track-top.png b/AppKit/Themes/Aristo2/Resources/vertical-track-top.png index 76c9dae31..2c38141ec 100755 Binary files a/AppKit/Themes/Aristo2/Resources/vertical-track-top.png and b/AppKit/Themes/Aristo2/Resources/vertical-track-top.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-center.png b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-center.png new file mode 100644 index 000000000..b1640721a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-left.png b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-left.png new file mode 100644 index 000000000..c4e97a04b Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-right.png b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-right.png new file mode 100644 index 000000000..1dc8a3c1a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-bottom-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-center-center.png b/AppKit/Themes/Aristo2/Resources/window-bezel-center-center.png new file mode 100644 index 000000000..0abf15784 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-center-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-center-left.png b/AppKit/Themes/Aristo2/Resources/window-bezel-center-left.png new file mode 100644 index 000000000..1454155a9 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-center-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-center-right.png b/AppKit/Themes/Aristo2/Resources/window-bezel-center-right.png new file mode 100644 index 000000000..589afca9a Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-center-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-top-center.png b/AppKit/Themes/Aristo2/Resources/window-bezel-top-center.png new file mode 100644 index 000000000..d9aef90b1 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-top-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-top-left.png b/AppKit/Themes/Aristo2/Resources/window-bezel-top-left.png new file mode 100644 index 000000000..62f6a96d8 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-top-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-bezel-top-right.png b/AppKit/Themes/Aristo2/Resources/window-bezel-top-right.png new file mode 100644 index 000000000..572e1c5e7 Binary files /dev/null and b/AppKit/Themes/Aristo2/Resources/window-bezel-top-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-center.png b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-center.png index 742efb518..686dafa23 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-center.png and b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-left.png b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-left.png index 673dd7edf..1a40efc7e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-left.png and b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-right.png b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-right.png index d133e5da0..15fa8f449 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-bottom-right.png and b/AppKit/Themes/Aristo2/Resources/window-popup-bottom-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-center-center.png b/AppKit/Themes/Aristo2/Resources/window-popup-center-center.png index 4996c1820..bab4ae051 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-center-center.png and b/AppKit/Themes/Aristo2/Resources/window-popup-center-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-center-left.png b/AppKit/Themes/Aristo2/Resources/window-popup-center-left.png index 4137a54d8..46f0c1e55 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-center-left.png and b/AppKit/Themes/Aristo2/Resources/window-popup-center-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-center-right.png b/AppKit/Themes/Aristo2/Resources/window-popup-center-right.png index 23122a900..e0e963e7d 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-center-right.png and b/AppKit/Themes/Aristo2/Resources/window-popup-center-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-top-center.png b/AppKit/Themes/Aristo2/Resources/window-popup-top-center.png index c4541ea56..e080b7de9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-top-center.png and b/AppKit/Themes/Aristo2/Resources/window-popup-top-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-top-left.png b/AppKit/Themes/Aristo2/Resources/window-popup-top-left.png index 5bbd1f53c..bbd94e3be 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-top-left.png and b/AppKit/Themes/Aristo2/Resources/window-popup-top-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-popup-top-right.png b/AppKit/Themes/Aristo2/Resources/window-popup-top-right.png index aecb2d0b0..bd9412849 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-popup-top-right.png and b/AppKit/Themes/Aristo2/Resources/window-popup-top-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-center.png b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-center.png index 29259fd94..d03bb4e08 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-center.png and b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-left.png b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-left.png index 87ef513f0..b0a733065 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-left.png and b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-right.png b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-right.png index f1247f14e..16586be2e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-bottom-right.png and b/AppKit/Themes/Aristo2/Resources/window-standard-bottom-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-center-center.png b/AppKit/Themes/Aristo2/Resources/window-standard-center-center.png index 2d8d70f28..ca1f9c12a 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-center-center.png and b/AppKit/Themes/Aristo2/Resources/window-standard-center-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-center-left.png b/AppKit/Themes/Aristo2/Resources/window-standard-center-left.png index 7da4f8a49..74c67df12 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-center-left.png and b/AppKit/Themes/Aristo2/Resources/window-standard-center-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-center-right.png b/AppKit/Themes/Aristo2/Resources/window-standard-center-right.png index 4d5f05e20..d1ecaf3f9 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-center-right.png and b/AppKit/Themes/Aristo2/Resources/window-standard-center-right.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-top-center.png b/AppKit/Themes/Aristo2/Resources/window-standard-top-center.png index 06be30779..2b2278c4e 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-top-center.png and b/AppKit/Themes/Aristo2/Resources/window-standard-top-center.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-top-left.png b/AppKit/Themes/Aristo2/Resources/window-standard-top-left.png index ba1f28575..1b11b4edd 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-top-left.png and b/AppKit/Themes/Aristo2/Resources/window-standard-top-left.png differ diff --git a/AppKit/Themes/Aristo2/Resources/window-standard-top-right.png b/AppKit/Themes/Aristo2/Resources/window-standard-top-right.png index b58c04964..f7768ee59 100644 Binary files a/AppKit/Themes/Aristo2/Resources/window-standard-top-right.png and b/AppKit/Themes/Aristo2/Resources/window-standard-top-right.png differ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 8222b9a8b..425664f12 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -253,7 +253,7 @@ var themedButtonValues = nil, + (CPScroller)makeHorizontalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 170.0, 15.0)]; + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 273.0, 15.0)]; [scroller setFloatValue:0.1]; [scroller setKnobProportion:0.5]; @@ -265,10 +265,10 @@ var themedButtonValues = nil, + (CPScroller)makeVerticalScroller { - var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 170.0)]; + var scroller = [[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, 15.0, 273.0)]; - [scroller setFloatValue:0.1]; - [scroller setKnobProportion:0.5]; + [scroller setFloatValue:1]; + [scroller setKnobProportion:0.1]; [scroller setStyle:CPScrollerStyleLegacy]; @@ -280,9 +280,9 @@ var themedButtonValues = nil, var scroller = [self makeVerticalScroller], trackColor = PatternColor( [ - ["scroller-vertical-track-top.png", 9.0, 4.0], - ["scroller-vertical-track-center.png", 9.0, 1.0], - ["scroller-vertical-track-bottom.png", 9.0, 4.0] + ["scroller-vertical-track-top.png", 7.0, 3.0], + ["scroller-vertical-track-center.png", 7.0, 1.0], + ["scroller-vertical-track-bottom.png", 7.0, 3.0] ], PatternIsVertical), @@ -302,9 +302,9 @@ var themedButtonValues = nil, ], PatternIsVertical), - trackColorLegacy = PatternColor("scroller-legacy-vertical-track-center.png", 14.0, 1.0), - incrementColorLegacy = PatternColor("scroller-legacy-vertical-track-bottom.png", 14.0, 11.0), - decrementColorLegacy = PatternColor("scroller-legacy-vertical-track-top.png", 14.0, 11.0), + trackColorLegacy = PatternColor("scroller-legacy-vertical-track-center.png", 15.0, 1.0), + incrementColorLegacy = PatternColor("scroller-legacy-vertical-track-bottom.png", 15.0, 14.0), + decrementColorLegacy = PatternColor("scroller-legacy-vertical-track-top.png", 15.0, 14.0), knobColor = PatternColor( [ @@ -362,10 +362,10 @@ var themedButtonValues = nil, [@"increment-line-size", CPSizeMakeZero(), CPThemeStateVertical], // Legacy - [@"scroller-width", 14.0, CPThemeStateVertical | CPThemeStateScrollViewLegacy], + [@"scroller-width", 15.0, CPThemeStateVertical | CPThemeStateScrollViewLegacy], [@"knob-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy], [@"track-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy], - [@"track-border-overlay", 0.0, CPThemeStateVertical | CPThemeStateScrollViewLegacy], + [@"track-border-overlay", 3.0, CPThemeStateVertical | CPThemeStateScrollViewLegacy], [@"knob-slot-color", trackColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy], [@"knob-slot-color", trackColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy | CPThemeStateSelected], [@"knob-slot-color", trackColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy | CPThemeStateSelected | CPThemeStateScrollerKnobLight], @@ -377,8 +377,8 @@ var themedButtonValues = nil, [@"knob-color", knobColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy | CPThemeStateScrollerKnobDark], [@"increment-line-color", incrementColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy], [@"decrement-line-color", decrementColorLegacy, CPThemeStateVertical | CPThemeStateScrollViewLegacy], - [@"decrement-line-size", CPSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy], - [@"increment-line-size", CPSizeMake(14.0, 11.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy] + [@"decrement-line-size", CPSizeMake(15.0, 14.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy], + [@"increment-line-size", CPSizeMake(15.0, 14.0), CPThemeStateVertical | CPThemeStateScrollViewLegacy] ]; [self registerThemeValues:themedVerticalScrollerValues forView:scroller]; @@ -391,9 +391,9 @@ var themedButtonValues = nil, var scroller = [self makeHorizontalScroller], trackColor = PatternColor( [ - ["scroller-horizontal-track-left.png", 4.0, 9.0], - ["scroller-horizontal-track-center.png", 1.0, 9.0], - ["scroller-horizontal-track-right.png", 4.0, 9.0] + ["scroller-horizontal-track-left.png", 3.0, 7.0], + ["scroller-horizontal-track-center.png", 1.0, 7.0], + ["scroller-horizontal-track-right.png", 3.0, 7.0] ], PatternIsHorizontal), @@ -413,9 +413,9 @@ var themedButtonValues = nil, ], PatternIsHorizontal), - trackColorLegacy = PatternColor("scroller-legacy-horizontal-track-center.png", 1.0, 14.0), - incrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-right.png", 11.0, 14.0), - decrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-left.png", 11.0, 14.0), + trackColorLegacy = PatternColor("scroller-legacy-horizontal-track-center.png", 1.0, 15.0), + incrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-right.png", 14.0, 15.0), + decrementColorLegacy = PatternColor("scroller-legacy-horizontal-track-left.png", 14.0, 15.0), knobColor = PatternColor( [ @@ -470,10 +470,10 @@ var themedButtonValues = nil, [@"increment-line-size", CPSizeMakeZero()], // Legacy - [@"scroller-width", 14.0, CPThemeStateScrollViewLegacy], + [@"scroller-width", 15.0, CPThemeStateScrollViewLegacy], [@"knob-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateScrollViewLegacy], [@"track-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateScrollViewLegacy], - [@"track-border-overlay", 0.0, CPThemeStateScrollViewLegacy], + [@"track-border-overlay", 3.0, CPThemeStateScrollViewLegacy], [@"knob-slot-color", trackColorLegacy, CPThemeStateScrollViewLegacy], [@"knob-slot-color", trackColorLegacy, CPThemeStateScrollViewLegacy | CPThemeStateSelected], [@"knob-slot-color", trackColorLegacy, CPThemeStateScrollViewLegacy | CPThemeStateScrollerKnobLight], @@ -483,8 +483,8 @@ var themedButtonValues = nil, [@"knob-color", knobColorLegacy, CPThemeStateScrollViewLegacy | CPThemeStateScrollerKnobDark], [@"increment-line-color", incrementColorLegacy, CPThemeStateScrollViewLegacy], [@"decrement-line-color", decrementColorLegacy, CPThemeStateScrollViewLegacy], - [@"decrement-line-size", CPSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy], - [@"increment-line-size", CPSizeMake(11.0, 14.0), CPThemeStateScrollViewLegacy] + [@"decrement-line-size", CPSizeMake(14.0, 15.0), CPThemeStateScrollViewLegacy], + [@"increment-line-size", CPSizeMake(14.0, 15.0), CPThemeStateScrollViewLegacy] ]; [self registerThemeValues:themedHorizontalScrollerValues forView:scroller]; @@ -549,7 +549,7 @@ var themedButtonValues = nil, [@"content-inset", CGInsetMake(8.0, 7.0, 5.0, 8.0), CPThemeStateBezeled], [@"content-inset", CGInsetMake(8.0, 7.0, 5.0, 8.0), CPThemeStateBezeled | CPThemeStateEditing], [@"bezel-inset", CGInsetMake(3.0, 4.0, 3.0, 4.0), CPThemeStateBezeled], - [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(1.0, 1.0, 1.0, 1.0), CPThemeStateBezeled | CPThemeStateEditing], [@"text-color", placeholderColor, CPTextFieldStatePlaceholder], @@ -586,20 +586,20 @@ var themedButtonValues = nil, + (CPTextField)themedRoundedTextField { - var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)], + var textfield = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)], bezelColor = PatternColor( [ - ["textfield-bezel-rounded-left.png", 13.0, 22.0], - ["textfield-bezel-rounded-center.png", 1.0, 22.0], - ["textfield-bezel-rounded-right.png", 13.0, 22.0] + ["textfield-bezel-rounded-left.png", 8.0, 23.0], + ["textfield-bezel-rounded-center.png", 1.0, 23.0], + ["textfield-bezel-rounded-right.png", 8.0, 23.0] ], PatternIsHorizontal), bezelFocusedColor = PatternColor( [ - ["textfield-bezel-rounded-focused-left.png", 17.0, 30.0], - ["textfield-bezel-rounded-focused-center.png", 1.0, 30.0], - ["textfield-bezel-rounded-focused-right.png", 17.0, 30.0] + ["textfield-bezel-rounded-focused-left.png", 12.0, 29.0], + ["textfield-bezel-rounded-focused-center.png", 1.0, 29.0], + ["textfield-bezel-rounded-focused-right.png", 12.0, 29.0] ], PatternIsHorizontal), @@ -615,13 +615,13 @@ var themedButtonValues = nil, [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled], [@"content-inset", CGInsetMake(8.0, 14.0, 6.0, 14.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], - [@"bezel-inset", CGInsetMake(4.0, 4.0, 4.0, 4.0), CPTextFieldStateRounded | CPThemeStateBezeled], - [@"bezel-inset", CGInsetMake(0.0, 0.0, 0.0, 0.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], + [@"bezel-inset", CGInsetMake(4.0, 4.0, 2.0, 4.0), CPTextFieldStateRounded | CPThemeStateBezeled], + [@"bezel-inset", CGInsetMake(1.0, 1.0, 1.0, 1.0), CPTextFieldStateRounded | CPThemeStateBezeled | CPThemeStateEditing], [@"text-color", placeholderColor, CPTextFieldStateRounded | CPTextFieldStatePlaceholder], - [@"min-size", CGSizeMake(0.0, 30.0), CPTextFieldStateRounded | CPThemeStateBezeled], - [@"max-size", CGSizeMake(-1.0, 30.0), CPTextFieldStateRounded | CPThemeStateBezeled] + [@"min-size", CGSizeMake(0.0, 29.0), CPTextFieldStateRounded | CPThemeStateBezeled], + [@"max-size", CGSizeMake(-1.0, 29.0), CPTextFieldStateRounded | CPThemeStateBezeled] ]; [self registerThemeValues:themedRoundedTextFieldValues forView:textfield]; @@ -638,7 +638,7 @@ var themedButtonValues = nil, + (CPSearchField)themedSearchField { - var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 30.0)]; + var searchField = [[CPSearchField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)]; [self registerThemeValues:nil forView:searchField inherit:themedRoundedTextFieldValues]; return searchField; @@ -748,29 +748,29 @@ var themedButtonValues = nil, + (CPComboBox)themedComboBox { - var combo = [[CPComboBox alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 29.0)]; + var combo = [[CPComboBox alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 31.0)]; var bezelColor = PatternColor( [ - ["combobox-bezel-left.png", 6.0, 29.0], - ["combobox-bezel-center.png", 1.0, 29.0], - ["combobox-bezel-right.png", 26.0, 29.0] + ["combobox-bezel-left.png", 4.0, 25.0], + ["combobox-bezel-center.png", 1.0, 25.0], + ["combobox-bezel-right.png", 24.0, 25.0] ], PatternIsHorizontal), bezelFocusedColor = PatternColor( [ - ["combobox-bezel-focused-left.png", 6.0, 29.0], - ["combobox-bezel-focused-center.png", 1.0, 29.0], - ["combobox-bezel-focused-right.png", 26.0, 29.0] + ["combobox-bezel-focused-left.png", 9.0, 31.0], + ["combobox-bezel-focused-center.png", 1.0, 31.0], + ["combobox-bezel-focused-right.png", 27.0, 31.0] ], PatternIsHorizontal), bezelDisabledColor = PatternColor( [ - ["combobox-bezel-disabled-left.png", 6.0, 29.0], - ["combobox-bezel-disabled-center.png", 1.0, 29.0], - ["combobox-bezel-disabled-right.png", 26.0, 29.0] + ["combobox-bezel-disabled-left.png", 4.0, 25.0], + ["combobox-bezel-disabled-center.png", 1.0, 25.0], + ["combobox-bezel-disabled-right.png", 24.0, 25.0] ], PatternIsHorizontal), @@ -808,7 +808,9 @@ var themedButtonValues = nil, [@"bezel-color", bezelNoBorderFocusedColor, CPThemeStateBezeled | CPThemeStateEditing], [@"bezel-color", bezelNoBorderDisabledColor, CPThemeStateBezeled | CPThemeStateDisabled], - [@"border-inset", CGInsetMake(3.0, 3.0, 3.0, 3.0), CPThemeStateBezeled], + [@"border-inset", CGInsetMake(3.0, 3.0, 3.0, 3.0), CPThemeStateBezeled], + + [@"bezel-inset", CGInsetMake(0.0, 1.0, 1.0, 1.0), CPThemeStateBezeled | CPThemeStateEditing], // The right border inset has to make room for the focus ring and popup button [@"content-inset", CGInsetMake(8.0, 26.0, 7.0, 8.0), CPThemeStateBezeled | CPComboBoxStateButtonBordered], @@ -833,12 +835,12 @@ var themedButtonValues = nil, { var button = [CPRadio radioWithTitle:@"Radio button"], - imageNormal = PatternImage("radio-image.png", 19.0, 19.0), - imageSelected = PatternImage("radio-image-selected.png", 19.0, 19.0), - imageSelectedHighlighted = PatternImage("radio-image-selected-highlighted.png", 19.0, 19.0), - imageSelectedDisabled = PatternImage("radio-image-selected-disabled.png", 19.0, 19.0), - imageDisabled = PatternImage("radio-image-disabled.png", 19.0, 19.0), - imageHighlighted = PatternImage("radio-image-highlighted.png", 19.0, 19.0), + imageNormal = PatternImage("radio-image.png", 21.0, 21.0), + imageSelected = PatternImage("radio-image-selected.png", 21.0, 21.0), + imageSelectedHighlighted = PatternImage("radio-image-selected-highlighted.png", 21.0, 21.0), + imageSelectedDisabled = PatternImage("radio-image-selected-disabled.png", 21.0, 21.0), + imageDisabled = PatternImage("radio-image-disabled.png", 21.0, 21.0), + imageHighlighted = PatternImage("radio-image-highlighted.png", 21.0, 21.0), themeValues = [ @@ -856,7 +858,7 @@ var themedButtonValues = nil, [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], - [@"min-size", CGSizeMake(19.0, 19.0)], + [@"min-size", CGSizeMake(21.0, 21.0)], [@"max-size", CGSizeMake(-1.0, -1.0)] ]; @@ -869,12 +871,12 @@ var themedButtonValues = nil, { var button = [CPCheckBox checkBoxWithTitle:@"Checkbox"], - imageNormal = PatternImage("check-box-image.png", 19.0, 19.0), - imageSelected = PatternImage("check-box-image-selected.png", 19.0, 19.0), - imageSelectedHighlighted = PatternImage("check-box-image-selected-highlighted.png", 19.0, 19.0), - imageSelectedDisabled = PatternImage("check-box-image-selected-disabled.png", 19.0, 19.0), - imageDisabled = PatternImage("check-box-image-disabled.png", 19.0, 19.0), - imageHighlighted = PatternImage("check-box-image-highlighted.png", 19.0, 19.0), + imageNormal = PatternImage("check-box-image.png", 21.0, 21.0), + imageSelected = PatternImage("check-box-image-selected.png", 21.0, 21.0), + imageSelectedHighlighted = PatternImage("check-box-image-selected-highlighted.png", 21.0, 21.0), + imageSelectedDisabled = PatternImage("check-box-image-selected-disabled.png", 21.0, 21.0), + imageDisabled = PatternImage("check-box-image-disabled.png", 21.0, 21.0), + imageHighlighted = PatternImage("check-box-image-highlighted.png", 21.0, 21.0), themeValues = [ @@ -892,7 +894,7 @@ var themedButtonValues = nil, [@"text-color", [CPColor colorWithCalibratedWhite:79.0 / 255.0 alpha:1.0], CPThemeStateDisabled], - [@"min-size", CGSizeMake(19.0, 19.0)], + [@"min-size", CGSizeMake(21.0, 21.0)], [@"max-size", CGSizeMake(-1.0, -1.0)] ]; @@ -910,9 +912,9 @@ var themedButtonValues = nil, [button setAllowsMixedState:YES]; [button setState:CPMixedState]; - var mixedHighlightedImage = PatternImage("check-box-image-mixed-highlighted.png", 19.0, 19.0), - mixedDisabledImage = PatternImage("check-box-image-mixed-disabled.png", 19.0, 19.0), - mixedImage = PatternImage("check-box-image-mixed.png", 19.0, 19.0), + var mixedHighlightedImage = PatternImage("check-box-image-mixed-highlighted.png", 21.0, 21.0), + mixedDisabledImage = PatternImage("check-box-image-mixed-disabled.png", 21.0, 21.0), + mixedImage = PatternImage("check-box-image-mixed.png", 21.0, 21.0), themeValues = [ @@ -1124,7 +1126,7 @@ var themedButtonValues = nil, + (CPSlider)makeCircularSlider { - var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 34.0, 34.0)]; + var slider = [[CPSlider alloc] initWithFrame:CGRectMake(0.0, 0.0, 30.0, 30.0)]; [slider setSliderType:CPCircularSlider]; @@ -1135,8 +1137,8 @@ var themedButtonValues = nil, { var slider = [self makeCircularSlider], - trackColor = PatternColor("slider-circular-bezel.png", 34.0, 34.0), - trackDisabledColor = PatternColor("slider-circular-disabled-bezel.png", 34.0, 34.0), + trackColor = PatternColor("slider-circular-bezel.png", 30.0, 30.0), + trackDisabledColor = PatternColor("slider-circular-disabled-bezel.png", 30.0, 30.0), knobColor = PatternColor("slider-circular-knob.png", 5.0, 5.0), knobDisabledColor = PatternColor("slider-circular-disabled-knob.png", 5.0, 5.0), knobHighlightedColor = knobColor;