From 88dd2f14956c71d33e9866970964bcb3394eadae Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Fri, 4 Jan 2013 11:52:36 -0800 Subject: [PATCH 1/2] Fixed bug with tokenfield --- AppKit/Themes/Aristo2/ThemeDescriptors.j | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 3e742d857..aa416616e 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -8,6 +8,16 @@ @import +var themedButtonValues = nil, + themedTextFieldValues = nil, + themedVerticalScrollerValues = nil, + themedHorizontalScrollerValues = nil, + themedSegmentedControlValues = nil, + themedHorizontalSliderValues = nil, + themedVerticalSliderValues = nil, + themedCircularSliderValues = nil, + themedButtonBarValues = nil, + themedAlertValues = nil; @implementation Aristo2ThemeDescriptor : BKThemeDescriptor @@ -636,11 +646,15 @@ + (CPTokenField)themedTokenField { - var tokenfield = [[CPTokenField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)], + var tokenfield = [[CPTokenField alloc] initWithFrame:CGRectMake(0.0, 0.0, 60.0, 29.0)]; overrides = [ + [@"bezel-inset", CGInsetMakeZero()], + [@"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], + [@"editor-inset", CGInsetMake(3.0, 0.0, 0.0, 0.0)], // Non-bezeled token field with tokens @@ -650,13 +664,12 @@ [@"content-inset", CGInsetMake(7.0, 8.0, 6.0, 8.0), CPTextFieldStatePlaceholder], // Bezeled token field with tokens - [@"content-inset", CGInsetMake(5.0, 5.0, 4.0, 5.0), CPThemeStateBezeled], + [@"content-inset", CGInsetMake(5.0, 8.0, 4.0, 8.0), CPThemeStateBezeled], // Bezeled token field with no tokens - [@"content-inset", CGInsetMake(8.0, 8.0, 7.0, 8.0), CPThemeStateBezeled | CPTextFieldStatePlaceholder] + [@"content-inset", CGInsetMake(10.0, 8.0, 7.0, 8.0), CPThemeStateBezeled | CPTextFieldStatePlaceholder], ]; - [self registerThemeValues:overrides forView:tokenfield inherit:themedTextFieldValues]; return tokenfield; From aa1559b159448b979e71c4bf5c2f442278676270 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Fri, 4 Jan 2013 11:57:12 -0800 Subject: [PATCH 2/2] Added missing images --- AppKit/CPAlert.j | 1 - .../Aristo2/Resources/colorwell-bezel-center.png | Bin 0 -> 85 bytes .../Resources/colorwell-bezel-disabled-center.png | Bin 0 -> 90 bytes .../Resources/colorwell-bezel-disabled-left.png | Bin 0 -> 134 bytes .../Resources/colorwell-bezel-disabled-right.png | Bin 0 -> 135 bytes .../colorwell-bezel-highlighted-center.png | Bin 0 -> 90 bytes .../colorwell-bezel-highlighted-left.png | Bin 0 -> 134 bytes .../colorwell-bezel-highlighted-right.png | Bin 0 -> 137 bytes .../Aristo2/Resources/colorwell-bezel-left.png | Bin 0 -> 129 bytes .../Aristo2/Resources/colorwell-bezel-right.png | Bin 0 -> 130 bytes .../Resources/colorwell-content-border-center.png | Bin 0 -> 75 bytes .../Resources/colorwell-content-border-left.png | Bin 0 -> 73 bytes .../Resources/colorwell-content-border-right.png | Bin 0 -> 73 bytes .../textfield-bezel-rounded-disabled-center.png | Bin 0 -> 86 bytes .../textfield-bezel-rounded-disabled-left.png | Bin 0 -> 238 bytes .../textfield-bezel-rounded-disabled-right.png | Bin 0 -> 246 bytes .../Aristo2/Resources/token-center-disabled.png | Bin 0 -> 95 bytes .../Aristo2/Resources/token-left-disabled.png | Bin 0 -> 295 bytes .../Aristo2/Resources/token-right-disabled.png | Bin 0 -> 312 bytes AppKit/Themes/Aristo2/ThemeDescriptors.j | 1 - 20 files changed, 2 deletions(-) create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-bezel-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png create mode 100644 AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png create mode 100644 AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png create mode 100644 AppKit/Themes/Aristo2/Resources/token-center-disabled.png create mode 100644 AppKit/Themes/Aristo2/Resources/token-left-disabled.png create mode 100644 AppKit/Themes/Aristo2/Resources/token-right-disabled.png diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j index 4c5e8a41a..8007a0f4d 100644 --- a/AppKit/CPAlert.j +++ b/AppKit/CPAlert.j @@ -560,7 +560,6 @@ var bottomHeight = 71; [_window setMovableByWindowBackground:YES]; } - _needsLayout = NO; } diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-center.png new file mode 100644 index 0000000000000000000000000000000000000000..835bb2e53e4bee9d7adbe4deb5bc68bcd98a71bb GIT binary patch literal 85 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!2%>F9*qwKQZk+{jv*Yf$%zF?Kle|6%FTSb j{>}^eJk1Whr5+6VQ^a?6R7D;Gs$=kU^>bP0l+XkKGN2cc literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-center.png new file mode 100644 index 0000000000000000000000000000000000000000..73ce9b719cf5022f6b84cbba0beeeff0b4681045 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!2%>F9*qwKQi`4~jv*Y;$%zvZetw?w)SQ`{ onfY|RL6fmUOia^>SE^eWPjw1)pZVl=4XBvG)78&qol`;+0Is;M1& literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-left.png new file mode 100644 index 0000000000000000000000000000000000000000..fb6c92e7f67a4715870e32cfbc3f4650db0c4954 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!`!2%?w8uaG?DPK<)#}JO0$%zRm4^kf_BtFNNNWf%;4$j=d#Wzp$P!l^)EO8 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-disabled-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae8971cb055f37b0e14b8d79ff8ca1b14a4efb8 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!`!2%?w8uaG?DL+pa#}JO_S3>i846CSlV;Z28~sWC_50;F jlQw=Ho>x3VJUtA~H{}g)NGgTe~DWM4fvi2>r literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-center.png new file mode 100644 index 0000000000000000000000000000000000000000..33051c355f9e9a59a765d66d1367287e81a1fb8c GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!2%>F9*qwKQi`4~jv*Y;$$|L^k>Te*&1-BG o?3t0EV#F-D@T60Ts5ukE*(WR(PU~k`0TnZNy85}Sb4q9e0DD>&U;qFB literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-left.png new file mode 100644 index 0000000000000000000000000000000000000000..84148f538813c03173d54bc93fed43ca538615df GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!`!2%?w8uaG?DPK<)#}JO_^#@BBGFK6CzCN=ih`kdTl(AR^2xCbvn!xJ$uKE{s>h&DgN^|L3_A8zX0j hM>sjP8OpqIU}zKN-hO0zS})LG22WQ%mvv4FO#rMVDVP8N literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-highlighted-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6b4b60ca3959b0b67c2828f66b0f1dcd433fa4fd GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!`!2%?w8uaG?sQ^zG#}JO_VqHpP<#)m?e?HHOQL?n2Z9NYvno59o7&t;ucLK6TWcr-8o literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-bezel-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4369e4b583599a8a68b9230412b5e5d3cef6db1e GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!`!2%?w8uaG?DGyH<#}JO_$JI dpjnVvnBlvI^4`uwFD9U&44$rjF6*2UngHB`DvSUC literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-center.png new file mode 100644 index 0000000000000000000000000000000000000000..42e6e798a59365360951d43171845bfddb33d86a GIT binary patch literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrK!2%@v#d3>)l#r*3V+coda)Lpc0+)nwjXyI3 X_dUiV8&loffU*ppu6{1-oD!M<(9RC? literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8294503769a32b9a4edcbb1ada35d4f98b4d40bb GIT binary patch literal 73 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrK!2%@v#d3>)lz^v;V+coda)Lpcf>5nLGlL5c Vi^fk8omoIR22WQ%mvv4FO#rAG4XywH literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png b/AppKit/Themes/Aristo2/Resources/colorwell-content-border-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8294503769a32b9a4edcbb1ada35d4f98b4d40bb GIT binary patch literal 73 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrK!2%@v#d3>)lz^v;V+coda)Lpcf>5nLGlL5c Vi^fk8omoIR22WQ%mvv4FO#rAG4XywH literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-center.png new file mode 100644 index 0000000000000000000000000000000000000000..f5d8de4c26f4bf3f1cbe7c4ae5928236402ed739 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{M!2%@R=j`zTQnH>djv*Y;$v@5?U~m-wXI%61 k{D=8WEGCS3x9Zs#B5#@`hd+7l1XRf2>FVdQ&MBb@08p+N0{{R3 literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4ec53b31b55a4b55212f20e6fea48f213b04fb2c GIT binary patch literal 238 zcmV?_bjO6Nes;;09OTPXGV_07*qoM6N<$g6G|3YybcN literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png b/AppKit/Themes/Aristo2/Resources/textfield-bezel-rounded-disabled-right.png new file mode 100644 index 0000000000000000000000000000000000000000..152acfd72b6f30752ea37a1f146f64e4043ac594 GIT binary patch literal 246 zcmV%Bi=lmuiu`2nE zg>v)H!NKhq^{-bYtuI wz6)}cRnp?QaUe(TGmh`1E{&xA^_SRu2fnL_b4$!_E&u=k07*qoM6N<$f_5@$9{>OV literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/token-center-disabled.png b/AppKit/Themes/Aristo2/Resources/token-center-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..64a06e738caf165f013ea890eac2c485a1cea639 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{R!2%?IGp(Nlq|`iJ978ywlPx~Ye|WZjnLLlr ue~B6Y7B8w_k;7*2>*#@!f5yzs3=A2Igjz4~O6>sZVDNPHb6Mw<&;$UFlpO>B literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/token-left-disabled.png b/AppKit/Themes/Aristo2/Resources/token-left-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..de6f5aa516e7cbcdc56d1bb07aa18e6d69fe66dd GIT binary patch literal 295 zcmV+?0oeYDP)>xi|0002)Nkl3a)o3f>w1qHYm|1tb$V1#OCTH&U$ zL_!E8@EaEZWKo`FfcQ4Zn>bM z%!Ve+3KV{!&dG!!%)RlMCMP4N@S4*aDp(9zG*dl75b8K2E4zGjm&!9Sp*xU)ci|Q_ zQ+^a-pm!KJtDVed$%wKuFu{c(>RH=UHOoar_!yZ$Aqq(Bg83ILIgDC{39Gr9l(002ovPDHLkV1hISZY=-+ literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/Resources/token-right-disabled.png b/AppKit/Themes/Aristo2/Resources/token-right-disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..86cbe135e8bc19e74586ef1badac0418288d8da1 GIT binary patch literal 312 zcmV-80muG{P)>xi|00030Nkl zr|-PKU(eHj`Stq6=IYYf$p8Sx?Q;0`aP(t$9UXvCUgbD{#_4qL4LYFwPKs3gnO?lw zJP?vDgeHZRrz`I*DA1*pLa3gseR`=^=u%24vDhzds0uX!Q1#FC3N-=H^Gv7HY5*Wb z>Yye7{u#zVO#sDT_a_2s0%)c&+7*Ht0B%iA-yUj`3WS--_4&3(b4g7p+~v*9+0KVU zgC?o>`8dCwO-A3hKJE*Hg!=Vzc7A>Q?z1~{Ga;c^mO|4sA%Xv#T7;e*P?b9X0000< KMNUMnLSTYfT#O9> literal 0 HcmV?d00001 diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index aa416616e..447a38530 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -650,7 +650,6 @@ var themedButtonValues = nil, overrides = [ - [@"bezel-inset", CGInsetMakeZero()], [@"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],