From 9772f99303b5b6ab7cd0561c68bbe9de402ae814 Mon Sep 17 00:00:00 2001
From: David Capello <davidcapello@gmail.com>
Date: Thu, 17 Sep 2015 15:19:47 -0300
Subject: [PATCH] Add scroll bars to Timeline widget (fix #732)

Changes:
- Added ui::ScrollableViewDelegate so ui::ScrollBar can be child of
  a non-ui::View widget.
- Added a generic ui::setup_scrollbars() utility to locate
  horizontal/vertical scrollbars depending on the scrollable area and
  the available viewport area.
- Replaced Timeline::m_scroll_x/y ints with m_hbar/m_vbar widgets.
- Added transparent scrollbar look & feel.
- Added a "hover" state to mini-scrollbars used in sprite editors.
---
 data/skins/default/sheet.png   | Bin 13592 -> 13834 bytes
 data/skins/default/skin.xml    |  28 +++++-
 src/app/ui/skin/skin_theme.cpp |  28 ++++--
 src/app/ui/timeline.cpp        | 161 ++++++++++++++++++++++-----------
 src/app/ui/timeline.h          |  16 +++-
 src/ui/CMakeLists.txt          |   1 +
 src/ui/scroll_bar.cpp          |  37 ++++----
 src/ui/scroll_bar.h            |  13 ++-
 src/ui/scroll_helper.cpp       |  82 +++++++++++++++++
 src/ui/scroll_helper.h         |  26 ++++++
 src/ui/view.cpp                |  81 ++++-------------
 src/ui/view.h                  |  79 ++++++++--------
 12 files changed, 365 insertions(+), 187 deletions(-)
 create mode 100644 src/ui/scroll_helper.cpp
 create mode 100644 src/ui/scroll_helper.h

diff --git a/data/skins/default/sheet.png b/data/skins/default/sheet.png
index 207b22b55ddd0e2b77efa8874348600019168ce2..af489296c57a833560a822728ca35f635bf50736 100644
GIT binary patch
literal 13834
zcmXY21ymbNv<~jB#hv2C-Q696TWQhaZiV7n+7cX!I|PT|UZ4<Mi%W2dYvJX8@13)|
zC)qPI$xdeO{p2Q2M@tz8lL8X}0N|*qDChwI2%PW}9~~8b2XjcZ2mqi1s4B=B_~)GF
zPNYzcWbWs`d*r5V`iv)~@+ImWR*G~Jc>oY+>gR4(ITvN|{EWG8{TdUqJfVgywi*Xg
zrtNpb&zx~Bvbb;MwvErv>|Ik?ctNHy7b=k$2GiTUd`gYIa=<0TVKf9r>rH8Ef}n%M
zlV87Lf5j&L`dwamx2R&^^C8&KXkXv0li-2{@R!s~)%UhR(AD>rFC`7tw{w+-EzF?{
zO>#`9^$W%>E9!f(Tu<6dFXPS`KZ|a+K-AA(lNSjcVGa_a8zBdw?}h=NRXZNM#fBUN
zDogSwJ^(E&NLX8VC#G+3f^A-3OtZAzHik=_SDm`}hK0zF^u{qpp`xwMj(M;Q4HigX
z?r}@gkpHKkF}FvpSenh8t7Vt{oKOLZt&*OuqnwxPJK>9q5nA!Gu+4C^zx%7LxwF#$
zmO`uDq>gh!Q2?PHcX;>ix7}W)NNC-IZflPldr@K(NxkF)-eO#{)wQ*9-KmNc0r`)w
zWVh!d_e(aru-YF_!y~wiXrC?mW^~v8YFhnq5a@@0{i7rHk@ci~PV(sIy^p*?U%lvo
z!=54BVyVh^-L5aoF3~+fSB7Ps8v&0|Mn1lpAp1YQd5xR{@A-IN4gw4m86@#J>M_|r
z?T%Gp!a9lB46BhJ+Br%bDz@$WZ=&JzvO+ll+gHC(O6uF_dSLIqy2hGxR4$@~$X}9;
z6~AWgXJC1Ta+rYHi}#|+GiTbGs&tnk-JOsdZsnElFWNJrmIu|Wi8#VjfF<zp|6EGY
zLPSIQ!G8K#>%#O2c>1@FnHnrY$Ew9PLRg$X<OD<k50CrFwrV2yhT!*D<B={lnP0i8
z0~CX$hBGF@6z6zN=quAeRNqIDbG#Bq>;S#~61D9}OcxBM_?qDN<6}&w4fghgT+0nv
z%F_)G2Ot2M?k6=n@lO&UdlNR){u$jN`f<KI`%HNvN@d?9SDl(e2`K&14@kVakM1B-
zJf5>q_WUP}$$+7{-EXKeHIyPLYjP%u%n6=vp2@iLr$MDYFQf1KBXuwmO8xhoAkhu3
zuV!px`#TqH&+GQbrcLz~$7&gI3_x*l@ulTu46Um}*SoE$AG#e~>MW*T=p$u-?<(I3
z+}9O~j5Kmq1)oRlbaAE(vL{;ii9xz;y6}^0-2h-KPKF8Qt2q=Ziw!Uh?KcUi`mwGz
z2FRdEt|O8c@}oW^x-xD4V9EFeR$B2cQo1kVChFglN7I(bXA#F4Vosq<jkyQujz;G<
zJDNz?SV|7*;KR0AO{@FFwmB4{n3YfhEygrLPw{2=+KDq_D)h#11!)__>Q)P|n6oAy
zy_<mYmCRe`EHWx!^)_g_IV6zdRM#j?oy;;kH5T)Ajma#<7Mr4(Sy=3;Tif_)fvq)@
zX+2DRi68<WJ)dLiaRTz}BxuCrlC=aP-6rfEwZ7A8A#rfeT!w8RX8k2F7fty+ZtS)h
zlO2<D*&S>s?r88coAXGVS+?0Bc;6ji={U=g(~7Lm!5P7H+@SW$TX6D(--hnvq4!vR
z=<iSF=pP#2z>ivskTuZ|Vk~u_@KLeu+9iQcxs?{<pjxhg(=l$Iv=1UQ*E=6uBvT_^
z;$!F4`N_%LrMPWZxf}{?pyxHp*itYB{~49O(i%+a42s&zz_R$0NN*qA@^OocBj5hR
zcGjJ$6?f>%!C6q!o9^c+M(f0_-f$jSQ}tg%*T~CR>>O`H0g);duj5Y*jp+y{6%bC-
zsHl>E{m^`|J`0p$e9F=jtTEbOvVb!+UBwIq`Td?{J|5nDgM}@*cGeJ5yH<i~2WJfX
zED#Lv={vhcI!wav5?eg%DDr!I4N>;gbNHXZJol#21msJi!%e};if9Ut6I)!Ni)Nxe
zCqfQ@7JqLDOH!ckbm1PERojWh-8IM8D8)frH-w$_gQjU1OTxT*SP)5BPY=eVsIYlY
zDP_x|&o|vgLd1bsl6ZXH%LuzQqb5z`0G*e9)7_&W<xg#Mt`6f#@Q-usweKmM%CWUN
z4cyJ~62+ZAJa<C`EC}ZdTJ%&(^UX;w$2+KdDHZ8z#?F<9YC0mj4mt@?2qt@W1>Zyq
z(irJ??byZCT!7z8=kBFfDkb^@yVWyxr}GuIZKmDB$Xz687@=O=q*i2K*jBvQYbSg@
zC+I?MCO&$EJR#bxl07;#3S-p^D90M=OO(-mqM1pKY+wH?l~8X#eMwMP5KD|V9;x0c
zd;F_;5X2zx3z0c;JUT|kV<6}vjAuiW4QLg5kZOc7HABV!%^|?V91As_Q#;+{gk+15
z-VAg##~kI@5>{vR8xznO`uMQ$Uqf-V$a#ArE|Y2nvLVuQ%yO)BKflZas*Mu0X<$Z)
zC|hH3VF?k3bKqM!X2=)YP}-;usu8j|rx7G{E^0EE>R$Wd%tTy8K$8zQ$F}BaMU%E^
z2&qEd$DSc*ZbkqwJirsbU&&NzH_tmMG|MXDt6P(uJ&8skt6{0XeEfZRBOB2SY<feT
zBIaR$o8Xd_!n{#bN@+?Hmpu|&^jQ?SNyhgV4}P#v_SR&scn4!$xGnP~f<xm$4*6#x
zhTQ>7K!63^G@(gwNiFT?M=CD1BsbzOyUVR^v}b?X^?C1B<4I&ljhuc-exVP<$mN`P
zgP8vJZK(rt<MMCEwQYE2IjxJqr|nj^Gh?nd6;Tk@!Dld1$nvk<ja4(~qi`@uHufhr
zlc+9LEr9p~8~*+}pFhhRZm9f0Noc8r{%Q5O_w2+cKl4mTt|OcetMb?@Mzy$@+3}wi
z6;7Y`z#(XVX{L$(g9Im;beyvUr(<+bJM_Itdo?1MAj>LPSgLW+f}u_c*e&n0hl_SC
z{R^@uD(A3!6B%*5O6GLvlkoIJ%3+NF+K-)jS6f&z+=w~hCQr(xF8p`uJs(DV3w~CZ
zkB^|h3KH)-xpHr>wfLK;G-qw}H0~9cSg%iE8e(4(JgW9(gXRDe<DblD%ponVE^ZDI
zRopu^q9Uw#k028|xen~yd=&t_#t{d$^FNvm|7fd??%p}$wVRdQ)^9bnwMrO@gVS{I
zUEV&yN9a{$TbxNHJwxogin40jBJ>cHgr<NmUx=BmwFDuqZcsm{{3%8V%o_0FKQ!zy
z;jOZKQUHB@&dG~zaMvi)=VpM_*4ED4u@^joAKxn)JU<@7l9G3?%CyKk1Ti=#*oKr0
zedj+4Q6yDgfDL?oeVrO_G%vs^O@ZM^?j!`W6T8>{Vx9H!ur)K3hk{CU)bi}#<ZG3s
zX-aHN6qat2kDN_db*JBTbV4UB_YrR-Iq6MBVa>h?Emcp&kL(XV?@dbA+{WD;Kc4^o
z(D;6ZFnp|eJIg4<=T`#f_}H;!;CbS;#$a)6j1>MIkc@bxffdLC5bpaHg@9_q_rr{!
z`s8HKljzk>3t8PO_#NkliJPWQs{}M;#ee{}EkWk=amL)O_ViB9Z{i*^ufm+O0)0#&
z;jmVVVqTNM@SJw-U$GWN?nraw5RBrwkZ@uCvk@swjp`l_orqENBjRFlvd{`Cj$P+X
zTRRtaOh6YG{^nkq#QE($9SRxL429MeAt4qUR;QOoklv$2*Nr!SDyCW;CO$M?l7$Fm
zUxYl}A}m>~meCv+hzjnU!MBSmORMK(dmxv|5PNSqb_*o3JT_`0I%XnpTB#b7V_`Wf
zEf96#eRPd+p_JgrkS?3T*nS-mgJ7L4vyMX5EKh&{1$E%#=-L(Ypc>sv*yHE`d6JTa
z_H81&QR8xT(_ka#6}wEav6bK<yG5`;Pua@d!rajK6_vBIGtkToi;yb;_{NRK@r;CD
z^0Qp@)moo`GMboviw*w2z}x|i3uVW~Y%13Vq;=+`lMX%M->G=&-&^Xe%D!kz){ojJ
z#9vud9aXRjiLPkl`;^>1d~AFJy~+uCIZEHC5Q+JQSH_!vzwV>5Xoe#H(ELg{SXnK9
z18ed4lK@5Z2y08*GSv16&HZ+CtGZFcmU89e)*hoa76624=e{#lf?vU*-wN`xzB3%*
zfke)!Q;;`0?-%Cf-Cmx@aI6;_{tF<tr>im3W<{1Xfq}3|>eH8P0)ycZEme0*pi$8@
zdLr*R>%RZvC;;$%G*Zx~hiZkMr=3WAPyie7NjsgO`<?Y&qrZe;EJvL^e^XpSbY<Zt
zzlCg;s+&_ni&L|v(AKUwf615=3lLKr4t$y!;K1iE(2+Br6$48>ghyyi$}u4xTpMY~
z{7T!wjRTK=^Fsdj`gA5ce_J)2KxxlCE*EVen66*kFgttD8%_Jl#T+P%%!u=Lvh}7@
zy8A-IB*p*rewg32n)$o6=pA>W@YZ@4l1u}5MGH}VuR@eN6<2c_DR@VR18m#xfKsbK
zHLu|6UI|TyFQctPR=k~UGh;l2-l5joZTOGi*7<OCrfha4v6!c<JdXJ`)M2RI@q$yX
z1p*nHCvbWY=isDv&WtY^3R$Hu;~Lv4{4_ggr(5Sjy&pj1VzN@Lxz-PJHnxh{5{;^M
z(08S8#$A<H_8x&})%g}>Dl?`;(AUY7f(t|P5E_V;Gn!TWbCu4jz(}DkkRMI=&X5|}
z-5r<ZTg&BL#u%@Q*4wKdTWi-CF{s*{bKpF^8PL|N8T?*-{FdI^=Rhh&rE1mXblTN3
ztKCYefs$fB@e2JLF*Ls7VR2!hI$-F#8HL>MAEeb^XgO{lq|rO_D-T8Jr~B-NA`iT8
ziJcAcv#RM0@%3;x8g+;ZY;uGw$TO#&Ddt{6cwRUnfZn7^n)=BxhIHvY?_jxfkHs@w
z4K_!pCQ9cyV3fV9!Dj0E9UB7VX`*~0+o3cctE1aLqx_RbzW{#^y-l4PA$8=EGq`=I
z`>g1NXhxAh(ZPWR+@aNo^Fw@_R7RcQMm^fA5~;`Iy((dN2%L*rI4bIa^B%L9l06|o
zDl5{+w%PUrvbrm7r8pP;?A>-9zL1eY_C><@)CTzY%MF~)!E%W|N7abTTq1!XutTyj
zO{J5kt$q4a3Hn^%;V-C#M`j&!_i7&(Z|D%m4|RjxX?EyWJ_W!~`v*YAcmOQejjKTQ
z2eJmeQFchVgrKtUw6g%kG?5=HO%s4rLz`Y#BBX8~>w6utKGcLh;EkSJ^0Dc~8<Yp(
zacV+kppNtrj7%$evS;O}BAcraxa<zJohDhz{(VB74|}{t`H)dCDR}Pl#O|uQT5`tN
z7oYHGe<ySoZ#60k8}em_Epg(yI3@ceo)Z!<;CjBLyjUk)SF*fhSYHM8l{aq7udbpJ
zR{PI&%U|?du8fjR;HKbp4Pojo8Q_w>_6!YM$BcAIJbV8<4ycH02I<87HLG!x!XlG4
z`tDyTx5AXS9ij;KPKfCU99}B4!>{6Qe_#T0m>Q=s8v6|$jjpi@-Zcm)cZ2K{)|s+W
zp^f<L##rj;Y2$KsWa?G^U!Co@IzHuZ!XKlh`+*a_cDer9Ktgo4Z3sr)uT(ejHwMp&
zV0E^OkQL-Si9h+k(Iul(A`b%XAfvm?ng6ot0!c!TBiGi=Db{cN3E5Se^pF<Fd<X|T
z8UgIEbG#&;W}Jt|-q_i;bm-fqlLUk}W^}Oh_*%ZEbrM&#;-*|6dv1+D`f$ag{NrTb
z%xMyGWF^caCEEn6?Yq`rjd`&`!SGD_x73jYhX4~*IhTq3%FnIav~-#`d&23vf=^-!
zwN_6;r^(?9Ld?khgUuiR2v~@=hsv!fJ%~Krp#Y*eMy95A0d6|gd3?%EChjN1tAeuO
z*7ANu?~mEElBE}Wy=&~Se0cfSg@=G{^-RT2W0d_&k;vE`MY3A5Cwl>ojbh2NZe~_$
zLQQud(p$+|irinc7Gs^$WDrvZHr2jVM=u|#*5gN@{8p6Uj5weY-G`_@-;4<7ZON7I
z-bEs$JLGHHdcMqI)PAyP4VvEUJo`9v+IY$uJ>;kQgF7@xU*qn*!!>Dk?yrcVcL~X-
z;UW^^L786i?_;84%D0~@h*mne6gX}Pvn)ZogL0f}y06AVs;wz1U+nR#Nvw^lr65l<
zpL(7?shE(>k8ofZ85{E;w!I${k@8(~h)zzS{_uTASxhpn(Cle5{Tu}ld_VmW(2E4A
zvb`vkz)L8yqXkucefQyv<sN8?JT1JZakqNjO)0@Pce5PI=6MqJs@J{o`quqy{&l(K
zEqA1vA2xLyD5cyz&nw%(M{!FZp?^{q)~{Wx&IW|$N+5lYdOy&V6H`8$UXsQjSM5-t
z<riBbTB~&jM}JG5qH7!o&-=@Am<9e~o~|3rEs`2vNU;^Gzjf2^QwK;EjJJ~(GOzos
zb?cDpM60?sFKA-&PW$#V!E(&B4Za%|dV!y`q;)7a_>ik7{S1Q?(MUmc`Ko7xEjPOD
z-W-exB&^eBpGf7vgyF&%hVc<3M>?%>q;Vt!*-VJ{d$3w^H;UEz9|YSq-KD5@JNg#8
zt{g^+ex)s`KmwWfeNIGxzwqhKppr%$CSP=gPup7><5rhuf*J-W=nNPOR4s~4OB##^
zY-29yS5;M6CmOcc5?`?Cm-a8dU)y&SO#~M!Xq$v+{-^;4$U(vhN+mcY8={T~nRk+`
zULZNhFT*@xxgUgO7)q@zB22s!zbnNJg)1S&C^qOIoV);*6prETvf!H1%jIhs?P|)L
zV%4@cnYPR=JDtaD!N)`-ya-(R-!2|``QEDK$CFWsd}Bk%@$(YcwZ)0XKk#RVvMwbp
zFc*~lHU^BlUnUmp@tNg^239atd63ob8{c1i4>7lW#pmCPQzEql8+~3wU0CGnNd5bf
z64OXyV2b7#yw25@020b|3E&k%g*~XwQxH8Nt*GK76Z{74NUet20yU=fuH&*9!A#1`
z8eksJ>j|icbbKJEN8d!yn_02-*TXMxEl$?z;Ze8-6lYT^zUeT1Ak}j$FFZ&lQT%3t
zi;TI5`)TH<*jhq}Qhwo)H`-_6jqarLkSEGROMZsWmXtbw-sXFRUh_|GM9XeT?>wK%
zO*uW!qP_NJx0K#`F_VJsCBT1vL7>vPTH`pl;Yf;#dLdl{2$svflzPk24rIL82~suT
z1#K`(>3^NZ{+aODvALXXiDZ`;GW@W5$9K!6F2NZ*{2&g0nNdoG3wWXpX-XU^>25Uv
z_KR%~UFP*uvq~%1^S(U7b-2k%EqmC?N>+yahY21fV8UIOnJJ0vH$i<TR1=fILLE#}
zJ8Tn>jjQVf+s@IEQ@|I@zJ{daOk@tZbg)a<MM??~;hS|FlzaUN6J#JgTYSiZONv2S
zuVBEEoIGNesKi*tMY79kJZ?K5otvARRkEi(P0BXs-VW{z@-mB^lQ|QZ6_W{Q^wF2Q
zS{=Ix5VCa$Ei_XLOR0NR`xDt8X0L8m9GCpp1|bNqdXt8CEecQl)~fl!rXu@!c`u|!
zs<`H*DHzD@vpge!3F7Ku5Ljt=!q+G?+cyP&wwMm^*r5ya*!g*<?^S%AHqlJ=-MZlD
z{#>KUDWYWAc46^P&QF0F6m`Pv;YTh!XZICCBCa~$m9xWkPsr2oz_)F2ln1b0FOx>?
zEQQM%+s&UbSdD8C2Rz5K!J4^kQlvPO_aQEh<~%Z|4RkROSH}>y1%u~^1>dS!imcFg
z-}4tfqkzHD3eANsFg2}J?=64uytRd^V&zB_eMh7eY<9^W+hqXXzj^**T?^E=W5Y$*
z2`-((k=g6Im!27_ANs6cilffQAqn;B?NWCbJJ(;-`&#&Qz8auR!Y!@vYj8S1S(2=h
zWd2K38lk)?aQw*oe6HVAr4R8|VI0g=3`7WG)m&qxp6RA7uBVotr9dsv?+e^X@7cFK
zhV2OGudB=+HZ@xl7!Hc+35$JHc;AWKeb}v~nxWx7+3xGG(L!>S`|Z_TzA&CNm!}Y^
zvwAv!tm<t-J_i5$BtnJv!8IHzMhkQ}dHgEX=nS~nTSj_QO#Jot54RoXwy#Agh~?bA
zlarRX-OH>aDNSSPxm}5)7mTXfg^aQGwkV$$vHdc;?G{1;pIY=GJSQ7iYC@u+$ji&)
z<h0@^hQ^_1@hMZwT67pRvI@3}oeywH%koVRT+-5|WT@sK%3tqJQeSMz9TSVMbVy2}
z9@f`(fxxUb{zJZjCLhG6X~ow6B~YS?0-hb7SmO4-{Y((6)M+R6)>Y<+i|LLf`Q~pR
z`I*l;KN(FKZ)c|2)qOH^-1l%rh=xkioNYijjB;-IRQ_^%SoY;|p3?u}C`qsFk!8GL
zX2Yb@Esac|ZAaldu!8?Od+=zYbuCaJq+uo}@_>lU!?7VF5{TiuLA%ZUAa@Lc%ft*^
z`5G*}wSPtScxH%b1b{|@F1Bgxqv%HZ>F(=a3;9GgiV;m*-iNjY{4%Sqv|mv?R$dj(
zWa}y4Naq}H<CGeDU4Z`Fr;i@+i|jb&-Zl5efT48X;bQ~74vZoDIm!*HZO%wOPv2@T
zC}kKZq-&ATkkK>LGiWf`*-VIMwVmy~w17Z~RZ+-P4W=pug&*Zx5?A7JO^h8=vuHWq
z^krRf+bAOMvfdHDju+bhUW}~bspP63WJgwiBMbZV=554{Xj$0R>1tAF^<2aQ&N}n+
z*kaG<oa=#*;^zti^F1{CNR8lgr#T*lYJgt?`#9e!?;^AreNn}Gc!#%f=tytqBxvIW
zwb4X}O>7U1tQtj$!?adPHJg^L#X&I65IY~#yYKEtEJ?_Lr6}@#)oAN~TTeUhP}B7t
zfwCOh>4G(RqYAldUF%J>W-g{E>Dnn{56B3skqM;Ozw5M#Ktqn5E6Xan;R3gJA#-G<
zBfETfx{nMeYmMCaHHjq)9BNp-Zr*hQkx!c{0z_cX2anNSFGa_cywX;G+k-rItTXE>
zINp{SUW|&*o%lz9>k$EU`Jtf)zQ70fTPgU0NIa%}Ugt=mllDU)+knI;v>oM0OZyE~
zB?-w{AlO3s*MnM{9_>7i=)d(H#|$k>!Y9`G?_WMm9sf5G;O*eB-GJoTGHr3PoNazg
z<EgXoZ>4A^5ZfyK*tbY@$OFbrg*m$|a;)?#xpV1S_*d~_9zV3p^x?77E*frx%+DM8
zEC|7sky=HSsf(?X5RGKo)T=66res6Q_9CvTmK3k<y;LY$4Ws>c`H$^H3S+<SJ}g?O
zn1I#l8zi5-1t@I9a>ojL6+cUm^`xK|m&JmT<4gA9OGBg{S{UL;VKW+jG&YWt4UD9k
z9h`YAr0MZd^Grs)wag5h{|iiET6uk6iehqe=l-);m{~3<b-1`b?%vwm9gbK&AXdbZ
zOns8vg6}mmu09WwKYvPp7v%nxE0!2kYu;Af6)S|^M6*>h8-y5Cstl2nAEZe@3rvAh
zDZ(4s0kyQJNZ0*4EuBg|q|+?k7IijF1*S$cq@?_vtQYYb`N<E&$m$*YT1lbrl)<C#
z^%9<eoZ^npw)WHY3EC0}9t0421&(n(OHRQp8d9T)o_G-Gv5=Q0rArATKh#CKd(kFn
z<=wr8-+bnzC`=<#{Ob#Csn0(`2%z2h5xbR>RF2Fh%p@Ud`VyTBmcvu&AXtN2?$V8Y
zotcQu4P=RQDDj_x(D~F8UelX8m1jvnEjq#rEgED-d&0e7mUNX&9KgyFMNXVxzD&At
zK9xRzMOc%Xv)Uld_YIx{6|S)0oy^h_OV6y!F8S_Va&xc&mRfT)NU=#TZgNWDBx(_J
z?~XGLq-{|th+@*l&?<-l*YQvnTX_ID`jNG6R=qovP=j^xUG?NX6s&UJ>Y>-83mek~
zo{9vc5nIEeiC~VQtjg1o91~(q|5#j(nXz-&S+|<)k13RZ7h~E7#Ld!o9N$Na>(v=X
z>|5iEPyX_?un`w>StO+W!5O4l*Ff6x%G1!7+>f?qEe3vLR91G7E9O}^n%IkL)X5ex
zJt2N_*nXRe=yeFSTa>;J0mq#%8X@wo{=2AqUH+3Rfab04^;xu2CN?S(T7~CalC(5v
zT^<-z$Y&&DtH`9lW;AqcZer@SGms^pv3ro4jTHe5hCh|{P*rCTcO*xgZa<3B?{_S*
zOm9nt=H$dkp1#L$R-e^Bpyv*0h|F5#Y_N=UXj^(VKyjo%1dHA%_F+bsU#)LGe_F4C
z&NUo0P(LBQe<GyK@BGK@&AosPDJ6k!m<38a>y(g`h^#Kd>6#a#=^XP3hLMCqvue4)
zu?or0?!4#fs*xhgwQqRN>vGjOq<<eJl0&9bKY)d~Ci>uAN>gQp@N7}OS~JJtqkeCm
zTl}8C7br2L7TTl3KTZ^B0jGoid0qP>3mD2B6J=s#q;Njc>cE;RL?6izb$~<T8poyu
z@l?6ThPz;!>9wwuDOQk{r0w<`FX&iV>l2n6<o(>>*hidJO*)AGWg`%GcNK)I!zF-;
zVJAyk1&>N?-mck)$yn2RDNsrdA$u0nB9ba{=e7>h*+nK(+;Uy1`4FkS@(0x>im5mf
z09+fM$l`ow`%r$5U93D^^(stwS^hwLNmibp?tFWASq^9Ib9czH{(9~8(|Xl_M(fCU
z%|y=?Orty)6@bUmHNgAaB83QfOGUGMO0N3z7FV$XCujO)9P|5HYIlsj_T`UzKFJme
z1*0(~l=EH}Aw%UIGB>iLds&x36HB)$>iCgz6a7wh7DEaxKOO^Tk|O=mb&5TfDIlOh
zMEM>)kGIzqV^cQv4i<Fv4pUK7F>kSQFe2#CBj~o>;e_$yMieAh+9x7r{}rC#pNl%q
z-zX1j#0LM%VP>%LUNlk>JqnVO6BcjRT>ttECymSe$J|5mobLa=Y_yKO-Y>pl)2@Z!
zg<YiM?cB^lciO*y%(;Y*hY0Pyrg(Xv-55!y4UB{YC&<qFl`dTX03<{I)dKt~ax8A#
z?r}M6{h^$hxgS<2GdQsQf5;=z>d(I~f&+fE5L$S&gA*l&u)biiTrp`axW#G%m+dPG
z4&ebYyvkk5?-@NW<ghu}Oac4zW04uwK%pv;d6`nq*hfUpgV{<mebm1}?$__&UOokX
zut-o(@OIK~2LUHy@jkz&5G^{{rFW)UA%eZus=PNgU}QzAq$Dw$nY;VKpB>Y|QeF<B
zw7a7<HOLI^x*c3sg;uQVIuh0X?vtYNWm3+$&nBQaeE#e4Ocp0^eFWjoqf7s%I_qwl
zUk|l#--Jp{8W~2_g5S-MG$g#`8BXCA54Ry*y9fKj9De89o7nw>hlRsZgAmDXVGoBF
zp*Emc?)`V{MS0hDGFeh1Y<4mbRfk1uoB)e@6?iI9fO-S&35%^0^Q<xFK_K44er%c!
zFQQ)@Ytbl}1!N-9$l+RQrUKh|gVON_zD%$Lw0Y!G!tFPdoL_3!MuO&i-GbCxyXQ^H
z$Ydeo%wB-yr^}b{!`~^Tc}9dBl1#v@Up-$pbIgQOhka#_6vh>+cb_XA+GEq6!@Ub<
znT!C5DM#$L!f{&6J^LY;h4Um0uT@DrE^Kst@$zh@0eO@iUjp*PV{%g!$Ccq-;Wn;N
zc0e4w_rk&g0039Dxot^E=#8#bc;rgGA=&%JhwvJPP}dC?A+J0u!R!gDY+>VHS06M$
zL~xuoypwfZ?e9AO6OJZU_EB`iVDe)Q>Tp*h1JXL^sfW2x*6Ox15ayG8|8V&FVCTA#
zmfsndE8QyY?fO85oIc$cr5LMGy#x8gWnw;_)E175_&3CSj2<A&xLej7i7YEZzu|%=
zd9`lv;+FObr{aGM-x^Hjiy;6e<%-5%llrx<$ifa6s7ar%q|ba4RKe(l(%;&a;nwH+
ze@-jb1T6(aG;#u6;QIrA19=#a)<7TWLkO2zA*IIn2lKGl=*bOMP4$p(R+xi;o~d^c
zwsB|xI)Sj+6IUYJYj$wxx!2EK=GY(aFttGTwo=qT<36&M?g=Df;ss8m_w`dzm=*@R
zNA5!#u<!luo|>PnUUe2mME!7G8Sl^J?-mhD+qGKZW`Y2bD7A|-p9QUIsTs!-OIY@!
zU111$d}0%b<f~LwCus|tG-~JBcw7;@-T}U?Hgk3!(Rvm?<#@gS$m1O4$d_p?mMb)Q
zou^gy<@Yf?De3IQPN4oMB6Cm6D34zSDnS*gvq{%NKQ6UvF=0&sTddXWu3kD_C>Bj;
z-Jvb@k?k4f8p@iXL^Y6<R6Zlh@Yq&#KSkCpm71zB$s3bvB2L-(0*vYt0g23hlK~_J
zora{}_(hDE8kIGJD`X-_VlK%(NzhRCcyF~{;n!>ulqr=(qtF|1DX4dutPT!%PDo$B
zwel>AEUhiD=W^aLT{2KeK<3CPzX0!gQoi^(ldr^q*!83e=e;C27yhmcPCax)j;_Av
zs~4SkV~0IsY8;>rmpcV`*M3e4cmLPWo{*Jn8Z+r*$?&YxSY3QWoeExV&&Mp}x1!;C
z1^A;|zf#_NQjmVa<h9FA-{<Rhf|!WF{xEAKI)-1k2su~gC!k|h9;jSYSFed%tj%<r
zhF%0{)M>&Ez`tLRIdDrHmiLP=%7SLiNjH`ZA;Z|2wB^dC=o8NIbJm15#vY*A%=M0a
zH~p}YLGn@cF}-4L8wnRF02yt+92_c*b20Ti_uzhidvB`ZWL&Em8m|3<?w+f-?t2r9
ztNzfHU^3M2iLqUVwa)5}v7PSpw;S$zH4BW$%ql{r<e1H5rHsC*ztnPZ+Ay>>gXfw;
zOo5k`1lG_~eCG(?#l5HAuVXVgq=V+_2dk+0zY372dDBvz$XexX_nrhlz-yhXN@pEK
z>G_zX6`kqi@GaiWIv+hS>aCj{lvXYHJZM$tNc$8fW^E>*|0MhN3XktgUoXJ%t-|$`
z2=i!ypXqr4@+p_h0&2g21N<n2JR3Cx@`h9i|7kXr&0bfQ!`uPH(@efzVaezmknE}B
z;p<F;DoO<03AbK@5Be`H4}tVijyMpa-C)l%`;)?kV>3W7@^~EFFf<j1v(~nzS$mKW
zLAns=a|Ytnn5kbdgYU-&pYkp}<Dxp(ZYdQT(=RI|S4UZJ=|#Nd)$S(|$7(1^-e21p
zl)>X&_Agw2z#A9~V9qM?a^A<!k?%4rOJuoV(6>jQo=o%@QTo39Q@;G}pVO9JKN6|(
z-xzSs2Dp2xDBJBGSN;oelS`yPd%0Fn=~4F^ZRGK#9dmNrBIkH7dDRd7sim5op<f|y
zZTkcWvt=N^1(Hx1;7li5DE+b|m8AChe5G5~k)TF4h(^57$av#)qM`a(3q_HV-IXt?
zp?yDHD!nEo?Rdhdj;m)Sx<DBXg$)Qyz=qj`&lj50(aWDyj10tEQ)gB;{Djs_s(PCv
z9c67?KR7LBXPh5+;ly7zSZQjI4)qo)M$A(;CydO72|{g4)~R!Ez9^<^xwv+CGPtd(
z{&u=kXD!xzFd=AUhhCLFL(Ub0x>SiIEEsuzI5MZMNPdlV;1W-=kdxWqYD#lFM1^>Z
z7kZbqMY>r|qv%2yw1^9=$0men7N{8WFB{aE{l<eKMxLRI5P}}8MZ<Ol^&I5!vP7AD
z5`)($=Wewx#4EdQjKE4@9GBtrOm2P)40~cxZ`QB!u{_Jtd4hEByEPa0B<VtsU#Quq
z_^6U66r9Hhl4+;AK15{o-8<sy7GWoYV5!EyWI5>aXN8ViF>ZeJOB>Ozxm~|$AF9we
zo@n4#=PR%Qj0F$KM6s=%x<W)nHqI)64VxcnkJC(&T4C;%V{BEOTvaw>oZa>EB%v_L
zDYSsr)Af1EkW`ialgZ%`CYd&c`>am#>E#QlOXut&@a%agw;YM8OBI{t5Eoz|CB{9&
zVJp=JB<K+Ewb`xx35ny=<Ij!h-R&VXBMarM?eqI8W2|)Idz%<c6I?ek*31bdI0kn`
zqD{jc?&;a|KfFii=CMFWrK|nS_`gjg)pNBw#H7-!(4d|Noz;Iq=fbq0bH~w%cf=OL
z@RgD@hchRIZfEIO)lqRIxMn}mLxWu|zP|A^5mP%&fo_Ygv3O%1lRiBJpeQ`U$0eo&
z{9$h~z=sLM@pLeX94)4vUB&-{?37AuXT;Zbmj+rKIeqyf)lLmr6gou5m}cHJ0d*ZY
zW0HNi#_A482(IVOK?1bI-<cgKfzLREGPUC;6b@0@7zDWohCV({dr@oQNh;SCl8{(Z
zzkG~dY&k?n$+KVP$hk5ebT1vb#q@R4*yyZ#Z*q&d4fHXKzT*|OUeaJXZA-*XxAe)^
zU#k<xYYC8B3IF=*CT4Sn+e|!bg|f&3%jdM2AV;T<{YuH<72yPPp7ex)&@|@LtS$jZ
zJr~%)W3Nlod+u8EVb`uUV&34EAry_>90lvLoy=zYfa?Tfp$1`9mjOi*>GKMc1R82r
z8-tRg!^(Mf>G<R7%p4A`<k=d{bjc6lPst5GpJdTh7ugc%fE9h-^(m$jBjB4Md^_CK
z7>D-gZxs(tRF|=KNBgF=+D|Jp`&W-tcLl^%rZ%M0dO^~l{@fWK3=9xuzQ|d^L}%;*
zpWUVEP@qqRRU38n#iENdmc^H69P0gS<nbhJu&}+HOa8TiaGcRfhSHO5mk>jwYU?f3
z&$WO)THI}G;Q*Pi+5(qcsP7HnoNYBzih>k!FKW;vK`JHuAV86Ogz9na0m18=A|(a<
z(B31!>-@@?ggMP#Sn0&YbkpV%7k9aP852Q*6G+k<=A8OUGQ5Pvb=A{P9)vIe)fSs_
zf93_ePP?D90<;`%jemRXA$o=*o#wAIBp75n;K+%@`)_hT%%8<V&EKxgpC2DLYEoHv
zo7V~Ii;2qCsAK$W(H>nq7KP)YiHyO@Lm)o=#V87Wfj#12r7x8Y|AahBjq~p9@`uf;
zLk&4+cIY~~a+UJ;Pv^$b^<#dH1WkRD(mohF13qhQw)wM$g37kcN0rZ2G)m3cJFB&&
zy8V5;u~ELL9jE^C0ZMah*a(MC7friDI9x^m6JRbKO$`%1S@?KS-sf8awBpC;F*nLW
zw^e)fwSK;}XF)7A)sH7*fq9{egOi7mB_)oto3LDD4yipdn$3YMRyntf(&yTd7_rvc
zt7>ytN{M?C*!G{Z{RSPE?oVzT{vKD4YJnOu^XgayB@A)8(NFi7VDUR!37VemY?I&P
z4&SAtM5$3)t!dag4P8F!_<^&P&`~by4EU@>2y**iHe5tU2SYlpbg==7!W86J^Q~MC
zsXS?ylr}OQK%mT%KhV>XGunDtA&fvOAIm5|=4ePz<hDjQ^6dcMTk9^kD=XnG!(h|K
z=f-{uJAnk(MgR8l&m`Uy1B>L>Vcawty`)dZ+=j8GoP}g6->uKkT=li-H@ouR+fn&B
zeev${@i_Id=;q(`PKg~iC#TF(o(qyhfoJOl1uwB&-w>O_YKDL_-3j&?plGGNfrnu^
zDD}f1$!MQN(na0=mXYl8L=~i<SqFS&0|<AI;g?_im_?UZk+(f^f_*bCw@Lz=%QTBZ
zly})jKW=08?_ATJLya{yl0MC)P~LX@_*iWf;7bSVywvE|fpBm1$T9)@=8)BwVdlvL
zAKVngA`DyDE}je8LZS7unV02@wr`vH%$j&8=9m*>@$LGiO1-p!9o)EUbp=;wMVWoI
zL9W@{<&JSb2yh6iRUG=KK~HwE3*KTlPH+Z*HKt9j%WAx0xmwJ~qypa7$t3whXS%-s
zpEUxvJDjJpCO*IcFO#XltdB6z7>agj<0C&&S91T&JHKnckzMJ*^a(tdI*>v8RRuL0
zuj&smti1($O{KZydA(o=x~6M}%*7MEP=KZ0*x0CF4~AQpNhDdEZyUfMEd5yW2l6VZ
zKdqfwqOd7VL~Y0J8t~V^kgrFCKp<jGNz~r`iGnnF4g2iAZK~+*DRsaFKcLC9R{{o?
z;BD6{Os*{G=XqmCn-MqRb!F`coAX~If>FwW%KmSQCj%n>C@YLOAe}oB&MPRBil;x5
zdm=YFY|8p)M5eZUkqqu62InG0#3o$?VtGIqQ=LH=iuQ>&Ty(-gwJCHUYI>0t2eOu(
zFO7&YiRAtRqCA>opqm7u+1st4PqH(!Ec=QKDbJChFDmu~hxio9f$m1+c5r_FX2&k<
z?^s5DM-MT3s3_8H%Cl3qB$7Da7T~hwMmw2y6bvY2#^Fag<)PqCn}uLkNOC36#hzIM
zL|||70=HA(;>Rl6EWDWAJoq@l+QpdTe&l=;h8K(#b_zU%0wf+T#I51)0GGXwFiY^~
zE<p$m9-}K~QHg#Nab<(&fZb1taSJh9jY%AnSMnfFcP9iqI1PczFzFVZEaZ02g)<3H
z&b=J3-^aQOLs>6u678M-B}6cpOM&zPa$CR+O^a=xtbX3K{DnIpj-F>7=iO#nzkXj)
zrAR%NH|Ge+(H||&Gqd16(KxSyYJWCIuI=#k>$S54c1vY&AN+irn&^vZgi!_D`e(cE
z)*m?qagsPVYWW!;kIi4|?vIMh7n#a)RacK~#u-?CmBCq-%(|;hbqK>;&{T7!?>kCX
z%dm<$hXiwG*mR|HF@AnKc{!!K@r}MiIblkW5XK$Fy{yjD^+V(CD<pDldSBU+tgy5K
z-{Pcr%3m#a*zTz6I8|>^#S&xYra{2W!Zo>MPLc_$iqe3!ZRwm5@$&JVr!N$trI{CA
z2UVt>@5`>-tYOjdzA#kZqG<Zp67Fn$i|ZjKVfDR1t;wj#T4}aoq2R|@%H;)SBY9*&
zln>X3G?h2UM}!tu`F0Tn9Wn3?m!Mj`Yit$mOQ}#+ccyz%t4n)&)L0vEO5-`nPXHTc
z%S+2a1Hfo|cJh0EA<^wfjQd*UUZn>_i`byHVMm+16}#UyctaCTe~jy@oETU(>)8I#
z!l?Am$qdlsq|RBcP98IMC%l<cQmj!=uQ@>cdxjelLw_@JMuRK6%q#)vMi?gdTZRjA
zbC{2BHgjG-W<?X<eB{oqeKGin0gA-C`Xfn&i2Czp8wPit01>3pNHz)i;aiJ@p6j7Z
zUx9?S-USXx1;mk|o6lENmeF$c_zH-~Y@X_ht^04rreU(b4-yOPBU>2b(7z+o+hr~E
zmKft&kC*AtbIt(1sE5{eQjA|as;9WuzQMWSl3&^7>m0{$P!`=*$FG<sW}g=f5p3LY
zYP}BfIUH|-T<VddeAD>{v@J^^T4yK3-HVMYX>NIY`c6}(hBLUd4~aq18%|cs45eC1
zG_Bi@ckO0^^aHCD)4pQ#lE^wV(tI74qmK!?z&<T>O|TPJ$%$=OxEaV03i+U1%z3A3
zUwQ7~9a8kWs5|AkeU(8frB<@VPV+Dr5^)(I_yQ0pPE9HC{DjdTe^j?3XHniVr(wTu
z(Ng@{DqvbN&a=VPOsPaFnzV_dX&kY)hMKVHu1R6`k1f|K;vL`Mub<_9CMXFUhbtmW
z7FU%%?JcQv-()Pa1`u+b%yc}aTPMPLwj=?Y@RGCUb0XQKa-Dwa+%vhblIw09hiZ8y
zu9@#51YS^`h516A<EQ?$z&A5v^jHaWAmX*&NcD7AhiN)mQdxXv?uCUZ27+y6##qar
z?ZW@)pwj9AdLNb>wcC;g3FQftpKN%3e0h35)2&(~iLCo2RQ5@cB#Ic?lOZK%1n=*)
z!<d!sONcCs|Nlq*{Q-3)l^H;bJxDwJ0p;>IyQYSVHGh0z0d(tymzz(AZY9#vn-pdy
zFAR;W0%pwM!tcd?@P;xQaB<u$83}8~4Q~MM<F=OY0MB!vOs`K9Q1Zt89-m_)=GPjt
zR`!S1mX_)VjEHwc$Fh}SNSmy8Yksr<nNAuJ_n()K5700gz~A}0P!jOQvk+Esg}6N-
zrAM{uyXZ-6{K#-1|C+0?W0eG1m=7NJ%MlHr*Lm@*4}Ln%a!1gS#zGMQXe}bW2{=@}
zDHlV0(_|NRDzfMbGc^b+>iC0%jr|3Q=r6{ASL%C&msnb2Nq!dE)t%ki&-FFj6t{C>
zkNOWU4>!^#dZkg@jqDu*$g+`FqUBn*uLzr}nq#a9c7`svk96I>_s;h#TXhJ4vt>WL
zvt?xqxd@=|wbos$jJhR8gi10{>yCDC@~VTQXW+c{85i)kOgyYV|4hUW%XJUZ<aO|j
zEK43MShH0I2z?x7%?AJmtB#--bc5YbY>1_}#QI#OFrIyr={b~$1Avhiyl@CB^qJ=s
zE9Iq!>@V#Z|E~0W+H4n&JWowQi74_k(pVGfB*Kf^{grTNRGH-qwC(8<>AqF?$ACah
i_<yo7djH@nS}+0M8B>8TKm0#l098dTg<3i5i2nf@zBX+D

literal 13592
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

diff --git a/data/skins/default/skin.xml b/data/skins/default/skin.xml
index 50a6e2104..ae6c6577c 100644
--- a/data/skins/default/skin.xml
+++ b/data/skins/default/skin.xml
@@ -260,7 +260,13 @@
     <part id="scrollbar_bg"                     x="64" y="144" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
     <part id="scrollbar_thumb"                  x="64" y="160" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
     <part id="mini_scrollbar_bg"                x="64" y="176" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
-    <part id="mini_scrollbar_thumb"             x="64" y="192" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="mini_scrollbar_thumb"             x="72" y="176" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="mini_scrollbar_bg_hot"            x="64" y="184" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="mini_scrollbar_thumb_hot"         x="72" y="184" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="transparent_scrollbar_bg"         x="64" y="192" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="transparent_scrollbar_thumb"      x="72" y="192" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="transparent_scrollbar_bg_hot"     x="64" y="200" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
+    <part id="transparent_scrollbar_thumb_hot"  x="72" y="200" w1="3" w2="2" w3="3" h1="3" h2="2" h3="3" />
     <part id="tooltip"                          x="112" y="64" w1="5" w2="6" w3="5" h1="5" h2="5" h3="6" />
     <part id="tooltip_arrow"                    x="128" y="64" w1="5" w2="6" w3="5" h1="5" h2="5" h3="6" />
     <part id="ani_first"                        x="144" y="192" w="5" h="5" />
@@ -451,9 +457,29 @@
     <style id="mini_scrollbar">
       <background part="mini_scrollbar_bg" />
     </style>
+    <style id="mini_scrollbar:hover">
+      <background part="mini_scrollbar_bg_hot" />
+    </style>
     <style id="mini_scrollbar_thumb">
       <background part="mini_scrollbar_thumb" />
     </style>
+    <style id="mini_scrollbar_thumb:hover">
+      <background part="mini_scrollbar_thumb_hot" />
+    </style>
+
+    <!-- transparent_scrollbar -->
+    <style id="transparent_scrollbar">
+      <background part="transparent_scrollbar_bg" />
+    </style>
+    <style id="transparent_scrollbar:hover">
+      <background part="transparent_scrollbar_bg_hot" />
+    </style>
+    <style id="transparent_scrollbar_thumb">
+      <background part="transparent_scrollbar_thumb" />
+    </style>
+    <style id="transparent_scrollbar_thumb:hover">
+      <background part="transparent_scrollbar_thumb_hot" />
+    </style>
 
     <!-- timeline -->
     <style id="timeline">
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 9118c03f4..36e32eb7e 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -1506,19 +1506,29 @@ void SkinTheme::paintViewScrollbar(PaintEvent& ev)
   if (skinPropery)
     isMiniLook = (skinPropery->getLook() == MiniLook);
 
-  skin::Style* bgStyle = (isMiniLook ?
-    styles.miniScrollbar():
-    styles.scrollbar());
+  skin::Style* bgStyle;
+  skin::Style* thumbStyle;
 
-  skin::Style* thumbStyle = (isMiniLook ?
-    styles.miniScrollbarThumb():
-    styles.scrollbarThumb());
+  if (widget->isTransparent()) {
+    bgStyle = styles.transparentScrollbar();
+    thumbStyle = styles.transparentScrollbarThumb();
+  }
+  else if (isMiniLook) {
+    bgStyle = styles.miniScrollbar();
+    thumbStyle = styles.miniScrollbarThumb();
+  }
+  else {
+    bgStyle = styles.scrollbar();
+    thumbStyle = styles.scrollbarThumb();
+  }
 
   widget->getScrollBarThemeInfo(&pos, &len);
 
-  gfx::Rect rc = widget->getClientBounds();
+  Style::State state;
+  if (widget->hasMouse()) state += Style::hover();
 
-  bgStyle->paint(g, rc, NULL, Style::State());
+  gfx::Rect rc = widget->getClientBounds();
+  bgStyle->paint(g, rc, NULL, state);
 
   // Horizontal bar
   if (widget->getAlign() & HORIZONTAL) {
@@ -1531,7 +1541,7 @@ void SkinTheme::paintViewScrollbar(PaintEvent& ev)
     rc.h = len;
   }
 
-  thumbStyle->paint(g, rc, NULL, Style::State());
+  thumbStyle->paint(g, rc, NULL, state);
 }
 
 void SkinTheme::paintViewViewport(PaintEvent& ev)
diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp
index 498d02d7d..61ced185c 100644
--- a/src/app/ui/timeline.cpp
+++ b/src/app/ui/timeline.cpp
@@ -47,6 +47,7 @@
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "she/font.h"
+#include "ui/scroll_helper.h"
 #include "ui/ui.h"
 
 #include <cstdio>
@@ -118,12 +119,12 @@ struct Timeline::DrawCelData {
 
 Timeline::Timeline()
   : Widget(kGenericWidget)
+  , m_hbar(HORIZONTAL, this)
+  , m_vbar(VERTICAL, this)
   , m_context(UIContext::instance())
   , m_editor(NULL)
   , m_document(NULL)
   , m_sprite(NULL)
-  , m_scroll_x(0)
-  , m_scroll_y(0)
   , m_separator_x(100 * guiscale())
   , m_separator_w(1)
   , m_confPopup(NULL)
@@ -137,6 +138,16 @@ Timeline::Timeline()
 
   setDoubleBuffered(true);
   addChild(&m_aniControls);
+  addChild(&m_hbar);
+  addChild(&m_vbar);
+
+  int barsize = skinTheme()->dimensions.miniScrollbarSize();
+  m_hbar.setBarWidth(barsize);
+  m_vbar.setBarWidth(barsize);
+  m_hbar.setBgColor(gfx::rgba(0, 0, 0, 128));
+  m_vbar.setBgColor(gfx::rgba(0, 0, 0, 128));
+  m_hbar.setTransparent(true);
+  m_vbar.setTransparent(true);
 }
 
 Timeline::~Timeline()
@@ -192,9 +203,7 @@ void Timeline::updateUsingEditor(Editor* editor)
 
   setFocusStop(true);
   regenerateLayers();
-  setScroll(
-    m_scroll_x,
-    m_scroll_y);
+  setViewScroll(getViewScroll());
   showCurrentCel();
 }
 
@@ -454,9 +463,10 @@ bool Timeline::onProcessMessage(Message* msg)
 
           case STATE_SCROLLING: {
             gfx::Point absMousePos = static_cast<MouseMessage*>(msg)->position();
-            setScroll(
-              m_scroll_x - (absMousePos.x - m_oldPos.x),
-              m_scroll_y - (absMousePos.y - m_oldPos.y));
+            setViewScroll(
+              getViewScroll() - gfx::Point(
+                (absMousePos.x - m_oldPos.x),
+                (absMousePos.y - m_oldPos.y)));
 
             m_oldPos = absMousePos;
             return true;
@@ -827,8 +837,7 @@ bool Timeline::onProcessMessage(Message* msg)
           dy *= 3;
         }
 
-        setScroll(m_scroll_x+dx,
-                  m_scroll_y+dy);
+        setViewScroll(getViewScroll() + gfx::Point(dx, dy));
       }
       break;
 
@@ -859,6 +868,8 @@ void Timeline::onResize(ui::ResizeEvent& ev)
     gfx::Rect(rc.x, rc.y, MIN(sz.w, m_separator_x),
       getFont()->height() +
       skinTheme()->dimensions.timelineTagsAreaHeight()));
+
+  updateScrollBars();
 }
 
 void Timeline::onPaint(ui::PaintEvent& ev)
@@ -1170,7 +1181,7 @@ void Timeline::setCursor(ui::Message* msg, const Hit& hit)
 void Timeline::getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer)
 {
   int hpx = (getClientBounds().h - HDRSIZE - topHeight());
-  LayerIndex i = lastLayer() - LayerIndex((m_scroll_y+hpx) / LAYSIZE);
+  LayerIndex i = lastLayer() - LayerIndex((getViewScroll().y+hpx) / LAYSIZE);
   i = MID(firstLayer(), i, lastLayer());
 
   LayerIndex j = i + LayerIndex(hpx / LAYSIZE + 1);
@@ -1185,7 +1196,7 @@ void Timeline::getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, Layer
 
 void Timeline::getDrawableFrames(ui::Graphics* g, frame_t* first_frame, frame_t* last_frame)
 {
-  *first_frame = frame_t((m_separator_w + m_scroll_x) / FRMSIZE);
+  *first_frame = frame_t((m_separator_w + getViewScroll().x) / FRMSIZE);
   *last_frame = *first_frame
     + frame_t((getClientBounds().w - m_separator_w) / FRMSIZE);
 }
@@ -1649,7 +1660,7 @@ gfx::Rect Timeline::getCelsBounds() const
   rc.x += m_separator_x;
   rc.w -= m_separator_x;
   rc.y += HDRSIZE + topHeight();
-  rc.h -= HDRSIZE - topHeight();
+  rc.h -= HDRSIZE + topHeight();
   return rc;
 }
 
@@ -1691,7 +1702,8 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
 
     case PART_HEADER_FRAME:
       return gfx::Rect(
-        bounds.x + m_separator_x + m_separator_w - 1 + FRMSIZE*MAX(firstFrame(), hit.frame) - m_scroll_x,
+        bounds.x + m_separator_x + m_separator_w - 1
+        + FRMSIZE*MAX(firstFrame(), hit.frame) - getViewScroll().x,
         bounds.y + y, FRMSIZE, HDRSIZE);
 
     case PART_HEADER_FRAME_TAGS:
@@ -1703,7 +1715,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_LAYER:
       if (validLayer(hit.layer)) {
         return gfx::Rect(bounds.x,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           m_separator_x, LAYSIZE);
       }
       break;
@@ -1711,7 +1723,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_LAYER_EYE_ICON:
       if (validLayer(hit.layer)) {
         return gfx::Rect(bounds.x,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           FRMSIZE, LAYSIZE);
       }
       break;
@@ -1719,7 +1731,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_LAYER_PADLOCK_ICON:
       if (validLayer(hit.layer)) {
         return gfx::Rect(bounds.x + FRMSIZE,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           FRMSIZE, LAYSIZE);
       }
       break;
@@ -1727,7 +1739,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_LAYER_CONTINUOUS_ICON:
       if (validLayer(hit.layer)) {
         return gfx::Rect(bounds.x + 2*FRMSIZE,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           FRMSIZE, LAYSIZE);
       }
       break;
@@ -1736,7 +1748,7 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
       if (validLayer(hit.layer)) {
         int x = FRMSIZE*3;
         return gfx::Rect(bounds.x + x,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           m_separator_x - x, LAYSIZE);
       }
       break;
@@ -1744,8 +1756,8 @@ gfx::Rect Timeline::getPartBounds(const Hit& hit) const
     case PART_CEL:
       if (validLayer(hit.layer) && hit.frame >= frame_t(0)) {
         return gfx::Rect(
-          bounds.x + m_separator_x + m_separator_w - 1 + FRMSIZE*hit.frame - m_scroll_x,
-          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - m_scroll_y,
+          bounds.x + m_separator_x + m_separator_w - 1 + FRMSIZE*hit.frame - getViewScroll().x,
+          bounds.y + y + HDRSIZE + LAYSIZE*(lastLayer()-hit.layer) - getViewScroll().y,
           FRMSIZE, LAYSIZE);
       }
       break;
@@ -1823,6 +1835,18 @@ void Timeline::regenerateLayers()
 
   for (size_t c=0; c<nlayers; c++)
     m_layers[c] = m_sprite->indexToLayer(LayerIndex(c));
+
+  updateScrollBars();
+}
+
+void Timeline::updateScrollBars()
+{
+  gfx::Rect rc = getBounds();
+  m_viewportArea = getCelsBounds().offset(rc.getOrigin());
+  ui::setup_scrollbars(getScrollableSize(),
+                       m_viewportArea, *this,
+                       m_hbar,
+                       m_vbar);
 }
 
 void Timeline::updateByMousePos(ui::Message* msg, const gfx::Point& mousePos)
@@ -1847,18 +1871,19 @@ Timeline::Hit Timeline::hitTest(ui::Message* msg, const gfx::Point& mousePos)
     hit.part = PART_SEPARATOR;
   }
   else {
+    gfx::Point scroll = getViewScroll();
     int top = topHeight();
 
     hit.layer = lastLayer() - LayerIndex(
       (mousePos.y
         - top
         - HDRSIZE
-        + m_scroll_y) / LAYSIZE);
+        + scroll.y) / LAYSIZE);
 
     hit.frame = frame_t((mousePos.x
         - m_separator_x
         - m_separator_w
-        + m_scroll_x) / FRMSIZE);
+        + scroll.x) / FRMSIZE);
 
     if (hasCapture()) {
       hit.layer = MID(firstLayer(), hit.layer, lastLayer());
@@ -1962,18 +1987,19 @@ Timeline::Hit Timeline::hitTestCel(const gfx::Point& mousePos)
   if (!m_document)
     return hit;
 
+  gfx::Point scroll = getViewScroll();
   int top = topHeight();
 
   hit.layer = lastLayer() - LayerIndex(
     (mousePos.y
      - top
      - HDRSIZE
-     + m_scroll_y) / LAYSIZE);
+     + scroll.y) / LAYSIZE);
 
   hit.frame = frame_t((mousePos.x
                        - m_separator_x
                        - m_separator_w
-                       + m_scroll_x) / FRMSIZE);
+                       + scroll.x) / FRMSIZE);
 
   hit.layer = MID(firstLayer(), hit.layer, lastLayer());
   hit.frame = MAX(firstFrame(), hit.frame);
@@ -2138,36 +2164,31 @@ void Timeline::updateStatusBar(ui::Message* msg)
 
 void Timeline::showCel(LayerIndex layer, frame_t frame)
 {
-  int scroll_x, scroll_y;
+  gfx::Point scroll = getViewScroll();
   int x1, y1, x2, y2;
-  int left = getBounds().x + m_separator_x + m_separator_w;
-  int top = getBounds().y + topHeight() + HDRSIZE;
+  int left = m_viewportArea.x;
+  int top = m_viewportArea.y;
 
-  x1 = left + FRMSIZE*frame - m_scroll_x;
-  y1 = top + LAYSIZE*(lastLayer() - layer) - m_scroll_y;
+  x1 = left + FRMSIZE*frame - scroll.x;
+  y1 = top + LAYSIZE*(lastLayer() - layer) - scroll.y;
   x2 = x1 + FRMSIZE - 1;
   y2 = y1 + LAYSIZE - 1;
 
-  scroll_x = m_scroll_x;
-  scroll_y = m_scroll_y;
-
   if (x1 < left) {
-    scroll_x -= left - (x1);
+    scroll.x -= left - (x1);
   }
-  else if (x2 > getBounds().x2()-1) {
-    scroll_x += (x2) - (getBounds().x2()-1);
+  else if (x2 > m_viewportArea.x2()-1) {
+    scroll.x += (x2) - (m_viewportArea.x2()-1);
   }
 
   if (y1 < top) {
-    scroll_y -= top - (y1);
+    scroll.y -= top - (y1);
   }
-  else if (y2 > getBounds().y2()-1) {
-    scroll_y += (y2) - (getBounds().y2()-1);
+  else if (y2 > m_viewportArea.y2()-1) {
+    scroll.y += (y2) - (m_viewportArea.y2()-1);
   }
 
-  if (scroll_x != m_scroll_x ||
-      scroll_y != m_scroll_y)
-    setScroll(scroll_x, scroll_y);
+  setViewScroll(scroll);
 }
 
 void Timeline::showCurrentCel()
@@ -2183,17 +2204,29 @@ void Timeline::cleanClk()
   m_clk = Hit(PART_NOTHING);
 }
 
-void Timeline::setScroll(int x, int y)
+gfx::Size Timeline::getScrollableSize() const
 {
-  int max_scroll_x = m_sprite->totalFrames() * FRMSIZE - getBounds().w/2;
-  int max_scroll_y = m_layers.size() * LAYSIZE - getBounds().h/2;
-  max_scroll_x = MAX(0, max_scroll_x);
-  max_scroll_y = MAX(0, max_scroll_y);
+  if (m_sprite) {
+    return gfx::Size(
+      m_sprite->totalFrames() * FRMSIZE + getBounds().w/2,
+      m_layers.size() * LAYSIZE + getBounds().h/2);
+  }
+  else
+    return gfx::Size(0, 0);
+}
 
-  m_scroll_x = MID(0, x, max_scroll_x);
-  m_scroll_y = MID(0, y, max_scroll_y);
-
-  invalidate();
+gfx::Point Timeline::getMaxScrollablePos() const
+{
+  if (m_sprite) {
+    gfx::Size size = getScrollableSize();
+    int max_scroll_x = size.w - getBounds().w/2;
+    int max_scroll_y = size.h - getBounds().h/2;
+    max_scroll_x = MAX(0, max_scroll_x);
+    max_scroll_y = MAX(0, max_scroll_y);
+    return gfx::Point(max_scroll_x, max_scroll_y);
+  }
+  else
+    return gfx::Point(0, 0);
 }
 
 bool Timeline::allLayersVisible()
@@ -2314,6 +2347,32 @@ void Timeline::dropRange(DropOp op)
   }
 }
 
+gfx::Size Timeline::getVisibleSize() const
+{
+  return getCelsBounds().getSize();
+}
+
+gfx::Point Timeline::getViewScroll() const
+{
+  return gfx::Point(m_hbar.getPos(), m_vbar.getPos());
+}
+
+void Timeline::setViewScroll(const gfx::Point& pt)
+{
+  const gfx::Point oldScroll = getViewScroll();
+  const gfx::Point maxPos = getMaxScrollablePos();
+  gfx::Point newScroll = pt;
+  newScroll.x = MID(0, newScroll.x, maxPos.x);
+  newScroll.y = MID(0, newScroll.y, maxPos.y);
+
+  if (newScroll == oldScroll)
+    return;
+
+  m_hbar.setPos(newScroll.x);
+  m_vbar.setPos(newScroll.y);
+  invalidate();
+}
+
 void Timeline::updateDropRange(const gfx::Point& pt)
 {
   DropTarget::HHit oldHHit = m_dropTarget.hhit;
diff --git a/src/app/ui/timeline.h b/src/app/ui/timeline.h
index e3b85de3c..537f4cf01 100644
--- a/src/app/ui/timeline.h
+++ b/src/app/ui/timeline.h
@@ -20,6 +20,7 @@
 #include "doc/frame.h"
 #include "doc/layer_index.h"
 #include "doc/sprite.h"
+#include "ui/scroll_bar.h"
 #include "ui/timer.h"
 #include "ui/widget.h"
 
@@ -52,6 +53,7 @@ namespace app {
   class Editor;
 
   class Timeline : public ui::Widget
+                 , public ui::ScrollableViewDelegate
                  , public doc::DocumentsObserver
                  , public doc::DocumentObserver
                  , public app::EditorObserver
@@ -99,6 +101,11 @@ namespace app {
     // called from popup menus.
     void dropRange(DropOp op);
 
+    // ScrollableViewDelegate impl
+    gfx::Size getVisibleSize() const override;
+    gfx::Point getViewScroll() const override;
+    void setViewScroll(const gfx::Point& pt) override;
+
   protected:
     bool onProcessMessage(ui::Message* msg) override;
     void onPreferredSize(ui::PreferredSizeEvent& ev) override;
@@ -212,6 +219,7 @@ namespace app {
     gfx::Rect getRangeBounds(const Range& range) const;
     void invalidateHit(const Hit& hit);
     void regenerateLayers();
+    void updateScrollBars();
     void updateByMousePos(ui::Message* msg, const gfx::Point& mousePos);
     Hit hitTest(ui::Message* msg, const gfx::Point& mousePos);
     Hit hitTestCel(const gfx::Point& mousePos);
@@ -219,7 +227,8 @@ namespace app {
     void showCel(LayerIndex layer, frame_t frame);
     void showCurrentCel();
     void cleanClk();
-    void setScroll(int x, int y);
+    gfx::Size getScrollableSize() const;
+    gfx::Point getMaxScrollablePos() const;
     LayerIndex getLayerIndex(const Layer* layer) const;
     bool isLayerActive(LayerIndex layerIdx) const;
     bool isFrameActive(frame_t frame) const;
@@ -246,6 +255,9 @@ namespace app {
     DocumentPreferences& docPref() const;
     skin::SkinTheme* skinTheme() const;
 
+    ui::ScrollBar m_hbar;
+    ui::ScrollBar m_vbar;
+    gfx::Rect m_viewportArea;
     Context* m_context;
     Editor* m_editor;
     Document* m_document;
@@ -256,8 +268,6 @@ namespace app {
     Range m_dropRange;
     State m_state;
     std::vector<Layer*> m_layers;
-    int m_scroll_x;
-    int m_scroll_y;
     int m_separator_x;
     int m_separator_w;
     int m_origFrames;
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 3c1905734..18d5b0d48 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -37,6 +37,7 @@ add_library(ui-lib
   register_message.cpp
   resize_event.cpp
   scroll_bar.cpp
+  scroll_helper.cpp
   separator.cpp
   slider.cpp
   splitter.cpp
diff --git a/src/ui/scroll_bar.cpp b/src/ui/scroll_bar.cpp
index a5c38b513..a0dc0b260 100644
--- a/src/ui/scroll_bar.cpp
+++ b/src/ui/scroll_bar.cpp
@@ -12,7 +12,6 @@
 #include "ui/message.h"
 #include "ui/scroll_bar.h"
 #include "ui/theme.h"
-#include "ui/view.h"
 
 namespace ui {
 
@@ -23,8 +22,9 @@ using namespace gfx;
 int ScrollBar::m_wherepos = 0;
 int ScrollBar::m_whereclick = 0;
 
-ScrollBar::ScrollBar(int align)
+ScrollBar::ScrollBar(int align, ScrollableViewDelegate* delegate)
   : Widget(kViewScrollbarWidget)
+  , m_delegate(delegate)
   , m_barWidth(getTheme()->getScrollbarSize())
   , m_pos(0)
   , m_size(0)
@@ -64,7 +64,6 @@ bool ScrollBar::onProcessMessage(Message* msg)
 
     case kMouseDownMessage: {
       gfx::Point mousePos = static_cast<MouseMessage*>(msg)->position();
-      View* view = static_cast<View*>(getParent());
       int x1, y1, x2, y2;
       int u1, v1, u2, v2;
       bool ret = false;
@@ -87,7 +86,7 @@ bool ScrollBar::onProcessMessage(Message* msg)
       u2 = x2 - border().right();
       v2 = y2 - border().bottom();
 
-      Point scroll = view->getViewScroll();
+      Point scroll = m_delegate->getViewScroll();
 
       if (this->getAlign() & HORIZONTAL) {
         // in the bar
@@ -96,12 +95,12 @@ bool ScrollBar::onProcessMessage(Message* msg)
         }
         // left
         else if (MOUSE_IN(x1, y1, u1+pos-1, y2)) {
-          scroll.x -= view->getViewport()->getBounds().w/2;
+          scroll.x -= m_delegate->getVisibleSize().w/2;
           ret = true;
         }
         // right
         else if (MOUSE_IN(u1+pos+len, y1, x2, y2)) {
-          scroll.x += view->getViewport()->getBounds().w/2;
+          scroll.x += m_delegate->getVisibleSize().w/2;
           ret = true;
         }
       }
@@ -112,18 +111,18 @@ bool ScrollBar::onProcessMessage(Message* msg)
         }
         // left
         else if (MOUSE_IN(x1, y1, x2, v1+pos-1)) {
-          scroll.y -= view->getViewport()->getBounds().h/2;
+          scroll.y -= m_delegate->getVisibleSize().h/2;
           ret = true;
         }
         // right
         else if (MOUSE_IN(x1, v1+pos+len, x2, y2)) {
-          scroll.y += view->getViewport()->getBounds().h/2;
+          scroll.y += m_delegate->getVisibleSize().h/2;
           ret = true;
         }
       }
 
       if (ret) {
-        view->setViewScroll(scroll);
+        m_delegate->setViewScroll(scroll);
         return ret;
       }
 
@@ -136,29 +135,29 @@ bool ScrollBar::onProcessMessage(Message* msg)
     case kMouseMoveMessage:
       if (hasCapture()) {
         gfx::Point mousePos = static_cast<MouseMessage*>(msg)->position();
-        View* view = static_cast<View*>(getParent());
         int pos, len, bar_size, viewport_size;
 
         getScrollBarInfo(&pos, &len, &bar_size, &viewport_size);
 
         if (bar_size > len) {
-          Point scroll = view->getViewScroll();
+          Point scroll = m_delegate->getViewScroll();
 
-          if (this->getAlign() & HORIZONTAL) {
+          if (getAlign() & HORIZONTAL) {
             pos = (m_wherepos + mousePos.x - m_whereclick);
             pos = MID(0, pos, bar_size - len);
 
             scroll.x = (m_size - viewport_size) * pos / (bar_size - len);
-            view->setViewScroll(scroll);
           }
           else {
             pos = (m_wherepos + mousePos.y - m_whereclick);
             pos = MID(0, pos, bar_size - len);
 
             scroll.y = (m_size - viewport_size) * pos / (bar_size - len);
-            view->setViewScroll(scroll);
           }
+
+          m_delegate->setViewScroll(scroll);
         }
+        return true;
       }
       break;
 
@@ -184,19 +183,18 @@ void ScrollBar::onPaint(PaintEvent& ev)
 
 void ScrollBar::getScrollBarInfo(int *_pos, int *_len, int *_bar_size, int *_viewport_size)
 {
-  View* view = static_cast<View*>(getParent());
   int bar_size, viewport_size;
   int pos, len;
   int border_width;
 
   if (getAlign() & HORIZONTAL) {
     bar_size = getBounds().w;
-    viewport_size = view->getVisibleSize().w;
+    viewport_size = m_delegate->getVisibleSize().w;
     border_width = border().height();
   }
   else {
     bar_size = getBounds().h;
-    viewport_size = view->getVisibleSize().h;
+    viewport_size = m_delegate->getVisibleSize().h;
     border_width = border().width();
   }
 
@@ -204,12 +202,15 @@ void ScrollBar::getScrollBarInfo(int *_pos, int *_len, int *_bar_size, int *_vie
     len = bar_size;
     pos = 0;
   }
-  else {
+  else if (m_size > 0) {
     len = bar_size * viewport_size / m_size;
     len = MID(getTheme()->getScrollbarSize()*2-border_width, len, bar_size);
     pos = (bar_size-len) * m_pos / (m_size-viewport_size);
     pos = MID(0, pos, bar_size-len);
   }
+  else {
+    len = pos = 0;
+  }
 
   if (_pos) *_pos = pos;
   if (_len) *_len = len;
diff --git a/src/ui/scroll_bar.h b/src/ui/scroll_bar.h
index 5c8998df3..ac149d268 100644
--- a/src/ui/scroll_bar.h
+++ b/src/ui/scroll_bar.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013  David Capello
+// Copyright (C) 2001-2013, 2015  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -12,9 +12,17 @@
 
 namespace ui {
 
+  class ScrollableViewDelegate {
+  public:
+    virtual ~ScrollableViewDelegate() { }
+    virtual gfx::Size getVisibleSize() const = 0;
+    virtual gfx::Point getViewScroll() const = 0;
+    virtual void setViewScroll(const gfx::Point& pt) = 0;
+  };
+
   class ScrollBar : public Widget {
   public:
-    ScrollBar(int align);
+    ScrollBar(int align, ScrollableViewDelegate* delegate);
 
     int getBarWidth() const { return m_barWidth; }
     void setBarWidth(int barWidth) { m_barWidth = barWidth; }
@@ -36,6 +44,7 @@ namespace ui {
   private:
     void getScrollBarInfo(int* _pos, int* _len, int* _bar_size, int* _viewport_size);
 
+    ScrollableViewDelegate* m_delegate;
     int m_barWidth;
     int m_pos;
     int m_size;
diff --git a/src/ui/scroll_helper.cpp b/src/ui/scroll_helper.cpp
new file mode 100644
index 000000000..00b47522c
--- /dev/null
+++ b/src/ui/scroll_helper.cpp
@@ -0,0 +1,82 @@
+// Aseprite UI Library
+// Copyright (C) 2001-2013, 2015  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ui/scroll_bar.h"
+
+namespace ui {
+
+void setup_scrollbars(const gfx::Size& scrollableSize,
+                      gfx::Rect& viewportArea,
+                      Widget& parent,
+                      ScrollBar& hbar,
+                      ScrollBar& vbar)
+{
+#define NEED_BAR(w, h, width)                       \
+  ((scrollableSize.w > viewportArea.w) &&           \
+   (vbar.getBarWidth() < fullViewportArea.w) &&     \
+   (hbar.getBarWidth() < fullViewportArea.h))
+
+  const gfx::Rect fullViewportArea = viewportArea;
+
+  hbar.setSize(scrollableSize.w);
+  vbar.setSize(scrollableSize.h);
+
+  if (hbar.getParent()) parent.removeChild(&hbar);
+  if (vbar.getParent()) parent.removeChild(&vbar);
+
+  if (NEED_BAR(w, h, width)) {
+    viewportArea.h -= hbar.getBarWidth();
+    parent.addChild(&hbar);
+
+    if (NEED_BAR(h, w, height)) {
+      viewportArea.w -= vbar.getBarWidth();
+      if (NEED_BAR(w, h, width))
+        parent.addChild(&vbar);
+      else {
+        viewportArea.w += vbar.getBarWidth();
+        viewportArea.h += hbar.getBarWidth();
+        parent.removeChild(&hbar);
+      }
+    }
+  }
+  else if (NEED_BAR(h, w, height)) {
+    viewportArea.w -= vbar.getBarWidth();
+    parent.addChild(&vbar);
+
+    if (NEED_BAR(w, h, width)) {
+      viewportArea.h -= hbar.getBarWidth();
+      if (NEED_BAR(h, w, height))
+        parent.addChild(&hbar);
+      else {
+        viewportArea.w += vbar.getBarWidth();
+        viewportArea.h += hbar.getBarWidth();
+        parent.removeChild(&vbar);
+      }
+    }
+  }
+
+  if (parent.hasChild(&hbar)) {
+    hbar.setBounds(gfx::Rect(viewportArea.x, viewportArea.y2(),
+                             viewportArea.w, hbar.getBarWidth()));
+    hbar.setVisible(true);
+  }
+  else
+    hbar.setVisible(false);
+
+  if (parent.hasChild(&vbar)) {
+    vbar.setBounds(gfx::Rect(viewportArea.x2(), viewportArea.y,
+                             vbar.getBarWidth(), viewportArea.h));
+    vbar.setVisible(true);
+  }
+  else
+    vbar.setVisible(false);
+}
+
+} // namespace ui
diff --git a/src/ui/scroll_helper.h b/src/ui/scroll_helper.h
new file mode 100644
index 000000000..289e17371
--- /dev/null
+++ b/src/ui/scroll_helper.h
@@ -0,0 +1,26 @@
+// Aseprite UI Library
+// Copyright (C) 2001-2013, 2015  David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef UI_SCROLL_HELPER_H_INCLUDED
+#define UI_SCROLL_HELPER_H_INCLUDED
+#pragma once
+
+#include "gfx/rect.h"
+#include "gfx/size.h"
+
+namespace ui {
+
+  class ScrollBar;
+
+  void setup_scrollbars(const gfx::Size& scrollableSize,
+                        gfx::Rect& viewportArea,
+                        Widget& parent,
+                        ScrollBar& hbar,
+                        ScrollBar& vbar);
+
+} // namespace ui
+
+#endif
diff --git a/src/ui/view.cpp b/src/ui/view.cpp
index bc47053bb..3e61914ab 100644
--- a/src/ui/view.cpp
+++ b/src/ui/view.cpp
@@ -13,6 +13,7 @@
 #include "ui/message.h"
 #include "ui/preferred_size_event.h"
 #include "ui/resize_event.h"
+#include "ui/scroll_helper.h"
 #include "ui/system.h"
 #include "ui/theme.h"
 #include "ui/view.h"
@@ -27,8 +28,8 @@ using namespace gfx;
 
 View::View()
   : Widget(kViewWidget)
-  , m_scrollbar_h(HORIZONTAL)
-  , m_scrollbar_v(VERTICAL)
+  , m_scrollbar_h(HORIZONTAL, this)
+  , m_scrollbar_v(VERTICAL, this)
 {
   m_hasBars = true;
 
@@ -89,81 +90,35 @@ Size View::getScrollableSize()
 
 void View::setScrollableSize(const Size& sz)
 {
-#define CHECK(w, h, width)                                      \
-  ((sz.w > (m_viewport.getBounds().w                            \
-            - m_viewport.border().width())) &&                  \
-   (VBAR_SIZE < pos.w) &&                                       \
-   (HBAR_SIZE < pos.h))
-
-  m_scrollbar_h.setSize(sz.w);
-  m_scrollbar_v.setSize(sz.h);
-
-  gfx::Rect pos = getChildrenBounds();
-
-  // Setup scroll-bars
-  if (m_scrollbar_h.getParent()) removeChild(&m_scrollbar_h);
-  if (m_scrollbar_v.getParent()) removeChild(&m_scrollbar_v);
+  gfx::Rect viewportArea = getChildrenBounds();
 
   if (m_hasBars) {
-    if (CHECK(w, h, width)) {
-      pos.h -= HBAR_SIZE;
-      addChild(&m_scrollbar_h);
-
-      if (CHECK(h, w, height)) {
-        pos.w -= VBAR_SIZE;
-        if (CHECK(w, h, width))
-          addChild(&m_scrollbar_v);
-        else {
-          pos.w += VBAR_SIZE;
-          pos.h += HBAR_SIZE;
-          removeChild(&m_scrollbar_h);
-        }
-      }
-    }
-    else if (CHECK(h, w, height)) {
-      pos.w -= VBAR_SIZE;
-      addChild(&m_scrollbar_v);
-
-      if (CHECK(w, h, width)) {
-        pos.h -= HBAR_SIZE;
-        if (CHECK(h, w, height))
-          addChild(&m_scrollbar_h);
-        else {
-          pos.w += VBAR_SIZE;
-          pos.h += HBAR_SIZE;
-          removeChild(&m_scrollbar_v);
-        }
-      }
-    }
-
-    if (hasChild(&m_scrollbar_h)) {
-      m_scrollbar_h.setBounds(gfx::Rect(pos.x, pos.y2(), pos.w, HBAR_SIZE));
-      m_scrollbar_h.setVisible(true);
-    }
-    else
-      m_scrollbar_h.setVisible(false);
-
-    if (hasChild(&m_scrollbar_v)) {
-      m_scrollbar_v.setBounds(gfx::Rect(pos.x2(), pos.y, VBAR_SIZE, pos.h));
-      m_scrollbar_v.setVisible(true);
-    }
-    else
-      m_scrollbar_v.setVisible(false);
+    setup_scrollbars(sz,
+                     viewportArea,
+                     *this,
+                     m_scrollbar_h,
+                     m_scrollbar_v);
+  }
+  else {
+    if (m_scrollbar_h.getParent()) removeChild(&m_scrollbar_h);
+    if (m_scrollbar_v.getParent()) removeChild(&m_scrollbar_v);
+    m_scrollbar_h.setVisible(false);
+    m_scrollbar_v.setVisible(false);
   }
 
   // Setup viewport
   invalidate();
-  m_viewport.setBounds(pos);
+  m_viewport.setBounds(viewportArea);
   setViewScroll(getViewScroll()); // Setup the same scroll-point
 }
 
-Size View::getVisibleSize()
+Size View::getVisibleSize() const
 {
   return Size(m_viewport.getBounds().w - m_viewport.border().width(),
               m_viewport.getBounds().h - m_viewport.border().height());
 }
 
-Point View::getViewScroll()
+Point View::getViewScroll() const
 {
   return Point(m_scrollbar_h.getPos(),
                m_scrollbar_v.getPos());
diff --git a/src/ui/view.h b/src/ui/view.h
index 34cc4c381..ead336e50 100644
--- a/src/ui/view.h
+++ b/src/ui/view.h
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013  David Capello
+// Copyright (C) 2001-2013, 2015  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -16,56 +16,55 @@
 
 namespace ui {
 
-class View : public Widget
-{
-public:
-  View();
+  class View : public Widget
+             , public ScrollableViewDelegate {
+  public:
+    View();
 
-  bool hasScrollBars();
-  ScrollBar* getHorizontalBar() { return &m_scrollbar_h; }
-  ScrollBar* getVerticalBar() { return &m_scrollbar_v; }
+    bool hasScrollBars();
+    ScrollBar* getHorizontalBar() { return &m_scrollbar_h; }
+    ScrollBar* getVerticalBar() { return &m_scrollbar_v; }
 
-  void attachToView(Widget* viewableWidget);
-  Widget* attachedWidget();
+    void attachToView(Widget* viewableWidget);
+    Widget* attachedWidget();
 
-  void hideScrollBars();
-  void showScrollBars();
-  void makeVisibleAllScrollableArea();
+    void hideScrollBars();
+    void showScrollBars();
+    void makeVisibleAllScrollableArea();
 
-  // Returns the maximum viewable size requested by the attached
-  // widget in the viewport.
-  gfx::Size getScrollableSize();
-  void setScrollableSize(const gfx::Size& sz);
+    // Returns the maximum viewable size requested by the attached
+    // widget in the viewport.
+    gfx::Size getScrollableSize();
+    void setScrollableSize(const gfx::Size& sz);
 
-  // Returns the visible/available size to see the attached widget.
-  gfx::Size getVisibleSize();
+    // Returns the visible/available size to see the attached widget.
+    gfx::Size getVisibleSize() const override;
+    gfx::Point getViewScroll() const override;
+    void setViewScroll(const gfx::Point& pt) override;
 
-  gfx::Point getViewScroll();
-  void setViewScroll(const gfx::Point& pt);
+    void updateView();
 
-  void updateView();
+    Viewport* getViewport();
+    gfx::Rect getViewportBounds();
 
-  Viewport* getViewport();
-  gfx::Rect getViewportBounds();
+    // For viewable widgets
+    static View* getView(Widget* viewableWidget);
 
-  // For viewable widgets
-  static View* getView(Widget* viewableWidget);
+  protected:
+    // Events
+    bool onProcessMessage(Message* msg) override;
+    void onResize(ResizeEvent& ev) override;
+    void onPreferredSize(PreferredSizeEvent& ev) override;
+    void onPaint(PaintEvent& ev) override;
 
-protected:
-  // Events
-  bool onProcessMessage(Message* msg) override;
-  void onResize(ResizeEvent& ev) override;
-  void onPreferredSize(PreferredSizeEvent& ev) override;
-  void onPaint(PaintEvent& ev) override;
+    virtual void onScrollChange();
 
-  virtual void onScrollChange();
-
-private:
-  bool m_hasBars;
-  Viewport m_viewport;
-  ScrollBar m_scrollbar_h;
-  ScrollBar m_scrollbar_v;
-};
+  private:
+    bool m_hasBars;
+    Viewport m_viewport;
+    ScrollBar m_scrollbar_h;
+    ScrollBar m_scrollbar_v;
+  };
 
 } // namespace ui