From 3b7302ecd4ccab57e43082372074a87e686e8ca4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Nov 2010 21:55:11 +0000 Subject: [PATCH] Fix up fade in/out cursors. git-svn-id: svn://localhost/ardour2/branches/3.0@8034 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.cc | 4 ++-- gtk2_ardour/editor_mouse.cc | 4 ++-- gtk2_ardour/icons/fade_in_cursor.png | Bin 1261 -> 1116 bytes gtk2_ardour/icons/fade_in_cursor_4.png | Bin 1116 -> 0 bytes gtk2_ardour/icons/fade_out_cursor.png | Bin 1250 -> 1116 bytes gtk2_ardour/icons/fade_out_cursor_4.png | Bin 1116 -> 0 bytes 6 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 gtk2_ardour/icons/fade_in_cursor_4.png delete mode 100644 gtk2_ardour/icons/fade_out_cursor_4.png diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 82bb84097d..8512200b07 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1301,12 +1301,12 @@ Editor::build_cursors () { Glib::RefPtr apixbuf (::get_icon ("fade_in_cursor")); - fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 40); + fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 0); } { Glib::RefPtr apixbuf (::get_icon ("fade_out_cursor")); - fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 27, 40); + fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 29, 0); } selector_cursor = new Gdk::Cursor (XTERM); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 98aa429f5b..a056b2dddc 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -776,14 +776,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case FadeInHandleItem: { RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); - _drags->set (new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); + _drags->set (new FadeInDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event, fade_in_cursor); return true; } case FadeOutHandleItem: { RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id); - _drags->set (new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event); + _drags->set (new FadeOutDrag (this, item, reinterpret_cast (item->get_data("regionview")), s), event, fade_out_cursor); return true; } diff --git a/gtk2_ardour/icons/fade_in_cursor.png b/gtk2_ardour/icons/fade_in_cursor.png index d57a76eccf5c1b15a96700be8c5d33b286d8e6d1..54287609179b58f2bb18011123ebb76e02b32059 100644 GIT binary patch delta 1071 zcmV+~1kn5K3ET)FiBL{Q4GJ0x0000DNk~Le0000U0000a2nGNE0G`o`X^|ls3k}x* z01ejxLMWSfkwzzf1KCMLK~z|Uy_a1`q*WNle`lOwW=s5N@LOzO3vt1V+;E&!XqW9; z3=6^#121B=A|<@=M!eb*TG$l24F(hvgidu>&sw%|H$CT*BOm=T%85m(!kba1q!w;4Prp7~`$0t9!P&xtaRzGyKZ}ctY;SL~ySvNo?k=HFh(I6!P%7!q3q=fkP*hZOFf}!$ zSS%(P=h6ZhHY)F#A z;jl(WM`c--fCZonurgh$bHRWExZmB~tw*_5bzby@_%9Hf$z1pwkD@` zY-~&phvP5c^~(UJ1OsncmX*xbzP>&I-vcjRCiF2dQ0#O%_m-BHBuSH#lLCGN3NIUa z5&yN7tvjI(lfh#tf?cv(mnk1>UwN=1J*@7MizuVTh0|n@JTkI2`10j?e>FkIILJKrhQv;eTMumEuX%w6NZ&BL74K2J8_y2s{G22y}AnP+$O8O-+rXv9Ynr=kq-} zHGb-HxpIewhMZkpU6huVCJ%(sX!KDMo>E?39(8qfI2;ZD_V@SM-ri<#aFFrw@k8JT zphwboc1aN+0{rOn`AhuQ2<-_WiBL{Q4GJ0x0000DNk~Le0000S0000f2nGNE04BOgijg523j|>R z00dzHrfnQ@kwzzf1Zqh{K~z|U<(E%P(`OjRKhMvyR;<@Y|n=ktEQdEfW<{6tkL#SoD?zzotKN^C{Rc5OCRSwm+|5zpi6rW4d+g*1v(4HwCQ=2-rpB&dA7!PE1T_ zd3pIPQ2n;B^#CvQ_4Vn@%#2o6Rwe=WMqovOz^8S8b#`;L4gl9Lt(C+-qzMu zef;>b0(Uk8w%XD_AP^uF3T>X9xt3ZimIu$CJyW00r@$whrEtkk_n||F^vRPaY8b}! zX2EhTeewMH^M@x+oXD7_Il5_fvZ`wnkuAJ`Y8&R?3GiKve0S;p5GW$MMC6Mi^IwR_ zt_=f4#3CZSz(b(DNNPLqP(*q~r1<|z!2=3MfCp~3JKNUQW&%S+a);X5+Dy0Godq5M zN7nnbKtyUpWX$1kTpb)7teu*gGW>pj(M1FJ{eGsVri{VC!CHsIaaBadM5JbQ-ZD^s zMC>AR&M=I7-QC^CB9REeU{DNW{rk!=41&R+L?RKoyStAWhH+0s&WVV9DaRrr0tA5{ zd_JG^(xpqr?%liDzJ2?0A*TE-MDe1Q$)T6egU}ca=A1V3TZljoz_y1bULk}P)J=amjbsfz};9Z)({SdIehrA zk;!BzD=S-}ARdqN^y$;0c2-qY;cz%sJj-M2kSrczD=M zrBW+a+27x90@r}%0&%Uszu(M#CzVR+@bIv?sO%1j=WCX>0q zqQ_zhm`o;hdU{&DUT+qd13C&G3soHfYQy318IQ;FqNk@Pn@A)uO|z(-0H$e@NF?a# z>B)LLo)_V8_zY0HSaSuW(5m+Wm+f}DHa0fuS_&H*8`W;NE3evrajj=kg0000907*qoM6N<$g6!^9@Bjb+ diff --git a/gtk2_ardour/icons/fade_in_cursor_4.png b/gtk2_ardour/icons/fade_in_cursor_4.png deleted file mode 100644 index 54287609179b58f2bb18011123ebb76e02b32059..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1116 zcmV-i1f%CX#A417>jRCF*kHKkZA zCP_LxJk-R*gxcHNRaRCe-~sR@@FDO9@EY(kPz{tpJh)T7(*UmkzJ`VdZES2vlEUGz zMn^|wS(bnWpbM}vU8-}zfCISS-QBH7BqB-j`~9k@s1WcK(DHv_=Yj9Fwzejxc5G}+ z4u|6};PuM@rUV0TT9%c}*1oU0s#UW(xti zPXoL-KR+)?>h0|n@JTkI2`10j?e>FkIILJKrhQv;eTMumEuX%w6NZ&BL74K2J8_y2s0yk76o^769w_Vxt)1H5x0 zOTX}Xy$XlJnwy(bWo2a)H~{XDq9y>uoKB~lPN#_9DsmHc2RJA%FOSa5%xGt4N0PL) zwWUPF9|Jdz**9LVSHWN~`Q6CKh+HmL1b7H^a_mrG09Q>-jia%#vC8N3Jvudh>ThsE4_L3{Zx_T4%#TXOq=;#pfr8xz*EK5yIO-H~HFb!0v z^?8A!o&($l{wALNr@)E#tH7;HYIUZ$a3tw-;41M7b$H^F5b=t3P13jL`8)R}k#?Xl iM#l!9Y-bJpr1}?QY8e~?*r^`?0000o$i!VORtU^QLmibID z=t~XJga~fNm+ne9%`J8j^xhLnEB-|1+E9$(=HL4?p5;HS@JZ^)FiR&4g+5Yd`>|F&* z+Nb6}@1kHc%K*25hd|7^J_MG5SzuAp&i@U{igmS_X?=a2cs#zZu~>|Sg#~73XNg9m zNl8CAL3}Cc=7FI64wv*F4Tr-gvq!}x9*^tBjT^dr`Lb$jYcs$#;H5(T3TeTN&8!aC zYHMqws;UZqpU;QS=cB&9o>1}VI`AENz&%#rp}%{D_|UW>WPB$g6IT)zHVx2(%jsfBq^0jsjsh3PV<$! z0?rBGmGbiPKSoAI_DkQ@)g|Dnt6&HIEU-8*FtFeKe!pM9Yp#MFcop#5mTazU9_xB43yAF2XA9i(hNs?ApR^;(`9_)3w+u#!(k0-vo zyevt7>hA6q@RsXf2mZ;WOP3@`Gcz*+emp90OJ!xHGMS8$$)w84%F@8ou7e%;YBU;^ zBn1Ki0p}iT^|9P_qQLzDG8>6R0O;)O1n4LUY-Y#I>}_Bu@91?i`_#;;N(Bc30e~}y zg3as#a1$6NI~a1M40s2)ZDtqE>{t;u>l+(?8vxYR)dAEL1)Eu`nOy^Bg27;$-|sJG z`Y03%oiwwnz%OQYzJN_E7K;H;U0n@OUGUulJ_6Fs&CT1>)6+^OlWK2o7w|=%?VG^g zi9|w6OG|2RZ{G!Wfo}kRZfBo9eOi)q=gu7gcXOQ>&*gm0h`V zh5Gt>yk0K=>2#WCG)f|oC|K)`jt(j+DuC=<*xK4+baa$(IQ%G;O8o_V04(6KWSGQeX=yT-fv9Ym#7rdh=b-|%_aum%~5;(_cE7@InHy8}=I$J~`a4HlE$;`Ha zUxD)_jnNY3>;~V}YNf`~!G+LH7xP2KfL0002ovPDHLkV1kJ5{aFA2 delta 1206 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 iL;n5a$YX(@r2GSTctQ6Gfd=^i0000