From 077fa94b3aeb7b93191c9a7816986ba2fb25923c Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Thu, 28 Jun 2018 21:17:11 -0700 Subject: [PATCH] Fix small cursor bugs --- css/context-menu.css | 1 - css/playlist-window.css | 1 - js/components/Skin.js | 8 +++++++- js/skinSelectors.js | 5 +++-- skins/base-2.91-png.wsz | Bin 88018 -> 88382 bytes skins/base-2.91-png/PTBAR.CUR | Bin 0 -> 766 bytes skins/base-2.91.wsz | Bin 101769 -> 102133 bytes skins/base-2.91/PTBAR.CUR | Bin 0 -> 766 bytes 8 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 skins/base-2.91-png/PTBAR.CUR create mode 100644 skins/base-2.91/PTBAR.CUR diff --git a/css/context-menu.css b/css/context-menu.css index acb03353..0a41c2b8 100644 --- a/css/context-menu.css +++ b/css/context-menu.css @@ -19,7 +19,6 @@ padding: 0; margin: 0; border: 1px solid #a7a394; - cursor: default; box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5); } diff --git a/css/playlist-window.css b/css/playlist-window.css index 61827fdd..c44cd0f0 100644 --- a/css/playlist-window.css +++ b/css/playlist-window.css @@ -65,7 +65,6 @@ #webamp .playlist-tracks { display: flex; flex: 1 0 auto; - cursor: default; } #webamp .playlist-tracks .track-cell { diff --git a/js/components/Skin.js b/js/components/Skin.js index baf62099..e3b585ea 100644 --- a/js/components/Skin.js +++ b/js/components/Skin.js @@ -117,7 +117,13 @@ const Skin = props => { if (cursorUrl) { cursorSelectors[cursorName].forEach(selector => { cssRules.push( - `${CSS_PREFIX} ${selector} {cursor: url(${cursorUrl}), auto}` + `${ + // TODO: Fix this hack + // Maybe our CSS name spacing should be based on some other class/id + // than the one we use for defining the main div. + // That way it could be shared by both the player and the context menu. + selector.startsWith("#webamp-context-menu") ? "" : CSS_PREFIX + } ${selector} {cursor: url(${cursorUrl}), auto}` ); }); } diff --git a/js/skinSelectors.js b/js/skinSelectors.js index 833ea07a..9bbc7506 100644 --- a/js/skinSelectors.js +++ b/js/skinSelectors.js @@ -337,11 +337,12 @@ export const cursorSelectors = { "#equalizer-window.shade", "#equalizer-window.shade input" ], - MAINMENU: ["#main-window #option"], + MAINMENU: ["#main-window #option", "#webamp-context-menu .context-menu"], MIN: ["#main-window #minimize"], NORMAL: [ // Use this as the default cursor. ".window", + ".window input", // Otherwise "#main-window", "#main-window.shade #title-bar" ], @@ -367,7 +368,7 @@ export const cursorSelectors = { PVSCROLL: ["#playlist-window .playlist-scrollbar"], SONGNAME: ["#main-window #marquee"], TITLEBAR: ["#main-window #title-bar"], - VOLBAL: ["#volume", "#balance"], + VOLBAL: ["#volume", "#volume input", "#balance"], WINBUT: ["#main-window #shade"], WSNORMAL: ["#main-window.shade #title-bar"], WSPOSBAR: ["#main-window.shade #position"] diff --git a/skins/base-2.91-png.wsz b/skins/base-2.91-png.wsz index b982a9e0c08bbdb38bccc47a73436682bf07d91a..5e2230e427bbff3cb254f39856d62c7d59c43dea 100644 GIT binary patch delta 2199 zcmaJ?ZERCz6n@XT)~@Z`2;J;h-P$FLw3ZgOZlWfdw!322+j~dvZP_{(MV+XDfj|7? z`~dNf5Cu}g6-kIQOCW)1v}z#{!I-I;f(&CwR3Jf&kxXU5uo&>;yzgD_?Om%sPJf(x z&U2pgoO9lueaHOqd*<4{gsIv|2(gmix4*W#w$-|I|Jm%2xo+^?u*+^jUrw}pZ=p`> zN7t0GDsbj@*blM~T@H^HogZ>^TbE%te`R{~lC*>nY8K)q$!Ku%$ojNgLrg_zrG61~ zYTuhQ9YP@A84xV%eND@R{F#@CSbEq_FKfB>Q(2AvK8ICr2ZxU@VnS4TW7&j_!S8;ot>~m(P1o2EmrxOMdxrJCC{=I%{O~Rd z%i6rbt5MDE+i;mVw`|n#jRFmi=s@{bN51Z1;Sc58G>rT!`E73Itvgc^d*_)w?WRfj zSnl+7uN8W&gLEL2N?X2Zj;m$~>u%^U>ZgetQ;enZY!w(7oudiLs0noPg>e&Dtjs@Q zH%2@6cES|<@__>u)F?nL{A6Muf2jw3SqjMQ%_ip0`$1Q>r5FD2)2(>vE6>yyI5lc? za;rIk>#w*NZ3TA#PE;|h3&9cssJB<~ghh>2TphT&oZOS>MQ*Ri;3*L<|YsTTK&6WAR!D|RSz z{qlb_IFx{+YJ)BTmeaFPrqjUoKv^$9$mlsLK(Od(RQ?e_9kNvff6=X`$|3}ep0~sj z_;C3Jx!BIrpYg4ASyFmWW@2Lfc{9+=+MX4mxiK(ENQzq>7lokQFQ;XUGO&;IL9=UY z7?CnkEG6>1dYpQg+CZ2J<~zWdU$+oK%|=S8j6aS5qC{_-JsoN3tetAqeDM3Tyt`UqCQ^`mfNjKwnGqG>x!yZCr(2V?^ z*+dApCK-tfWko!+$gJ(rRZqDIc@E8C;J4|0Wp)iL)0-CW<>of|% zb3O6-P11!>b?nABg1_?fsdk|ndqFd*abXUh;Rn+9r?@_iD1A+oPjIN+lxh8;iMel3 ze`-diPv0aYDGH(_bLCTDQm$L|#_`=T=Z^QcUE< zROO?(ieU}+b|9J*&vKO&zK?1b@1zykx>USQCh)fylo5HH#6qMJ(Jms~;`3qFWM#<$ rYjLEO1f4q*?SH_Y$57`|9@W*J#CgGvtOeJt9^xTY`0v{;0^ak#ycgU` delta 2191 zcmZuzZD?C%6h5anZPO;*O4r72t!-1Vqo3*8rn)J(q`j*lH@VrpH!;l|%#T(CTQ@&I ztQN`!6SPc;aGfGdbaU8EnHkFvXIqs0sEX^vKPvth8?vs-M08?{dfxXYH@V4L&Y$z1 zkLNkhIhTC?N$KT}ORFM5!Bz_ZcGxgJ^LkaY{gt~H6SHJz2I?I`?Xx3E+2JmKd3uUD z_1~T7O3pft3lyC6I$O->)L!SHeJgpTmF1}`>J|WIWzYyAf6xBO$D>*W2-(v5MlZJN zat&6eR%>@`;lecSi6WPPc9dxDi5 z)IZ~|mGP(93Ac$qd2Zq=FZ9l2OMW5Fwv+K%4<21T zHw>^!R!O|X-63BfY;rTPfB4k5!@T^9XIstksS{@pHga#*a!Zb2}cAmE6w5I*c z`skOdu%J=8X#-vp_+wcO<~D<)NRxcin|ZxUos^kTDWTsN#6Nh>&8|$2i9Ef%8|O>- zMv=j|1B}Jipi4SC-n?P6~2cVtZZZk_mu&>)6^0O4rJFDhzr6l;5o zqFm2RP?W5MvdZL|8YFMBp!g(MPK|<0-mKqFl?W&)04<05G$1Iq5_g z@<%mI4j1We6zFHexVG?>`|xG}W)+rU{8Wt)3k-{L5yn9_iFX&m2Y(>l*jZaUpXk8c z0^All|LQyu!-l$xod_dhSd14pVdy+HU#ss?lMl$OO_qCTI+AZR;)@p1Glp16L#+SQ z!$_z@vLq|TN5^jUAquN=Z=-5zAR!h>$@Q3HdUW-%j(j(Zu9p?!qMfIp{105AXq>afEeBpuAJAt7O3!{?rN0NVaU0RBrO T5-g=F0BENFR0XX-m|oz2w4Z^Z diff --git a/skins/base-2.91-png/PTBAR.CUR b/skins/base-2.91-png/PTBAR.CUR new file mode 100644 index 0000000000000000000000000000000000000000..8b73d0ed28f891ce012c6e40ccff6a0ec2889176 GIT binary patch literal 766 zcmds#y-veG5QN7GlIhM>DkQt4B%(!f#H-{5(wPdbb9t|1@hUWwNG?o)vV3bG)**yM z%hvO>QqhFM=%PHafHQ{cwG5v;W`08~6iSvtw(O5KTf4ih?CPS=4m aIGQek319a$53RL=71pqX0oJgE5AYp)yPIJE literal 0 HcmV?d00001 diff --git a/skins/base-2.91.wsz b/skins/base-2.91.wsz index 459bb72b3730465f0d6f1676c6cefd6774eb6033..285675be85ce63f1049e863f550a7f99808f8022 100644 GIT binary patch delta 2224 zcmZ`*Yiv_x7=Ax`SuYHu8M_usnGrT|6J=mRVr;jQrS`NvJw0t^w>V(KL{Jc9iD*oi zD+qLhNrU|%w*?3c6Bc$Pfck?#MhGNaVl-+nafTlzZc{U65OMSU&Nt4bXY0~G&-c8S z=e>2iKetaDvd%>YjD zKr-0CMQZ|KAt5=zGR>CXvaKn%QhN5L_vyzz#O{lVZT&*Ri^zJ z?_!2lg%+x)5K7t@dRoxXJ3^h4p{|q~D_fho%D{h8stDQF{D!0Y*^_tqzDtp=pHS!I z9Hv5$0)DZkJ|QY9O3u_Z({J|B=y)|%F}$Vaz%m!WQQBn4* z!7J>cH={jV$Q)&0OSf7)t)l*(3N?$ip2-SEUDvNtZz1z>_g~eA zY<;wfJV&cneX9SXFR*1}1pscWUL+9?aAG{)O?Lf%LrTyM(w&>v^ev7DQ=Ho3=|Rml zP5#PazA~i=YM)xm!0S5DSE;B}=HW);#={;bc5*J82O%1#^OLs)=N^z1&ZRVW{kYNG zxtJ7`cw;t?2TqBci@AwfgY(`2SbpkQ>&j*TkDVxk$i>3`pmB<@l;^iCA@OGB z=yn&WwNkaYzBFMIkXw`{OY^bKGhmm}q}F0IeR2nRKHqfB4pNhk4bFgBcACSAJN4-; zH}7UCwvc^}cXqS^=r+{`7Fsk#SeYx!Gvm-ALOf1I~S%4>rsubQ99%_kM{1)tT0dWFh~| zpsx={u^MdWl$&j)74E^Jb&X-`=%T5|-ArsnV)3y*Xm09JGPBN5cfUVEp}}~4l#hz+ z_M3>GVRohBB$iu$olLY`40*+YDO90dB{SXUAN=3q1poj5 delta 1862 zcmZ`)Ye-XJ7=FJtbz5dZ&e^Qi%21IxfE|H3EFz1E7VeP{x;Vg2m?Y1pHc1 zjk4u!X;nrwrHhYE)5kRAuO^jBy|R3@L;N+n?w8$|- zK|PMLG={c&qUbZvVl6{;L1mU$9DKmQpFt&rY_6!(sO^_)9pZ&*Q$}k|RuCP?52_uy zLTdK;x9u;csR1rwJ`HB`bLIY|Xv=pmRToh9qPmVX-wgn@#Q+(|F6G=wWNF{TT(y-Z zZf`Va7?sG`V!zzS{9SKS{E07`E->&wGwb4cPfS6T;XI{^!{On)In+g{a>1v54ZzC% z06Mx4!5MIINk*=;f6*}MR#~YTyN@w)zH6Eyf48e|8KXB0FnWI%b&@0AA9%)acfaBTLwINWyp$9XRG#+LcKZbKNbO+b;SI#RYN;pl5??)7Pb`VplmB2dLdj!y zhvMwfTbCxCB*vV&EdXAwlo#90k{RP%No^7FgJv>$qSnST((q7D^8)(x~mZPGl?Cjr30&$oh|5BkOE;t3Rvi^h|JCK;W_%D_maM?I- z%4PH-FK6~JM)C1ME;$J^mq`Q9AECSDN_c;&p^;vCkcOWvTk6eTqiXknjMW$UyGd^O z57Kh;bp#uUl$Xk!D~z4k$CGHqDFoY)Xy6K|VDfgKhKV7|1SXKR0C$cN{M-Bolj(=T diff --git a/skins/base-2.91/PTBAR.CUR b/skins/base-2.91/PTBAR.CUR new file mode 100644 index 0000000000000000000000000000000000000000..8b73d0ed28f891ce012c6e40ccff6a0ec2889176 GIT binary patch literal 766 zcmds#y-veG5QN7GlIhM>DkQt4B%(!f#H-{5(wPdbb9t|1@hUWwNG?o)vV3bG)**yM z%hvO>QqhFM=%PHafHQ{cwG5v;W`08~6iSvtw(O5KTf4ih?CPS=4m aIGQek319a$53RL=71pqX0oJgE5AYp)yPIJE literal 0 HcmV?d00001