From 6c608286908fe8f15e63bbf55feb17f6b8c972bc Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <buggins@fromru.com>
Date: Mon, 24 Mar 2014 10:39:33 +0400
Subject: [PATCH] scrollbars, part 2

---
 examples/example1/main.d                      |   3 +
 examples/example1/res/scrollbar_btn_down.png  | Bin 356 -> 371 bytes
 examples/example1/res/scrollbar_btn_left.png  | Bin 359 -> 378 bytes
 examples/example1/res/scrollbar_btn_right.png | Bin 349 -> 353 bytes
 examples/example1/res/scrollbar_btn_up.png    | Bin 356 -> 371 bytes
 src/dlangui/widgets/controls.d                |  60 +++++++++++++++++-
 6 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/examples/example1/main.d b/examples/example1/main.d
index 29763117..0327f02e 100644
--- a/examples/example1/main.d
+++ b/examples/example1/main.d
@@ -68,6 +68,9 @@ extern (C) int UIAppMain(string[] args) {
 	    vlayout.addChild((new TextWidget()).text("VLayout line 2").textColor(0x40FFFF00));
 	    layout.addChild(vlayout);
 
+        ScrollBar sb = new ScrollBar("hscroll", Orientation.Horizontal);
+        layout.addChild(sb.layoutHeight(WRAP_CONTENT).layoutWidth(FILL_PARENT));
+
 		layout.addChild((new Button("BTN2")).textColor(0x000000FF).text("Button2"));
 		layout.addChild((new TextWidget()).textColor(0x40FF4000).text("Text widget"));
 		layout.addChild((new ImageWidget()).drawableId("exit").padding(Rect(5,5,5,5)));
diff --git a/examples/example1/res/scrollbar_btn_down.png b/examples/example1/res/scrollbar_btn_down.png
index a0e7db766aca78397adb2620cbac0e049c6a64f0..19ab977b7066d2b3d98cb2db242ef2858343f117 100644
GIT binary patch
delta 302
zcmV+}0nz^C0`mfpPJb8%B{2L-PNo0=0R>4!K~yNuV_={FFhMa{YMAh7Kn2!b)Bany
zPgsUS0TTlQ1B0de#HH3=)BeM){PFGeE@o!7NT|ktNE(?K7#RLpxKCKd#LOD?{p;)9
z3=9m+%nS?+|DQiNuvtvn%!rMhFF;DcN&D%&U8`Uk%-#A{vVX9!M|}VKdiS}5^$`pV
z4BwccCjNZ>;J|8e8A~HJcD?{fd3(L5_ja!|bLn2g%E}e`<NMp~=MK~bFfcHDW?*1o
zU_^EX0|NttsZ-k~HVy&bAK%{Y;NTMW`1#|*mNWaR{E?jfj}c1<{WEjvT*u1B8~E$z
z=MAU#mIors;U|p~OZSOOiHJL_@xnw-Dxn?#0Dw7E=XUI^>;M1&07*qoM6N<$f<Cj9
A$^ZZW

delta 287
zcmV+)0pR}g0^|aaPJb5)5i09@tr-9S0QN~lK~yNuoszGw!Y~kkziVEDshQd`Ne~Fk
zW)N)udd=ii6BG!<l0n@d1hu43kS*JLyq{;<^zO@dy;ed9fj@@gAE5w32>c|R*1Q3T
z$e0-RAA#w)0=Qf*bX|vtd@>He?RMjQK0i$%1orzqkH>?uEPsijXe=Do>-9=iRcNh=
z;}|6(>~=ehF<5J9+ja(c@3GdhSS%=t0;Lo(jJ)rA>bj<B8uC16wOVmHov7=YG)>uV
zw`i>ap3wB7&N&W;14)wLy=S>xl4aS<KAMIBhzQ5y5$7D6&4%@QJ<E-zS0ldP?-*lV
lKEapJw4GmlqZsc1fOpF2mrk>Zy(<6!002ovPDHLkV1gN+h&=!R

diff --git a/examples/example1/res/scrollbar_btn_left.png b/examples/example1/res/scrollbar_btn_left.png
index 8e9749ca5bcff3cd9aa1afc2e9728336978cc5aa..24ff084502064c068b7bfc323234fd7571322db1 100644
GIT binary patch
delta 309
zcmV-50m}a80{Q}wPJb8%CIx}i*+u{W0Srk*K~yNuV_+Z*m>7rzFopca4vjmly{7#~
z7H7ht;U5D71G}+9<0=j=QMbQ;e=SE=z=F#v6UUZy?3_YwfB*hkeqv`q6p~>KjMy}o
zI<;+L;}G!u^ZWbile>$<kTsy&#KgeBz+mRmxrUXE*Z23YFMsP!?J2|1fNT>J0|Uc9
zOZSOOnV4Cletdho<LrT2Piz{{oyWw$z`$VY+_{#Goj2h3udi!Q?I{hxXA^25IJIqN
z=MeDu^XJE^le>z-(KRySiX&sk<}DnY!k*Ydj~R<5Mg|6kf6pK6Un?qQX3oaW=P#q=
zruO9Sj<ryY|1Pmb?mwvHk8=m>Bffuqy_<=dHHv{mfZ-Yd_k~>Y>RDT700000NkvXX
Hu0mjf%*C7%

delta 290
zcmV+-0p0%k0_OsdPJb5)5&>-L2bur?0QpHoK~yNug_6CCgHRB}e=89rSeQz&PLU#w
zHe$d(-71h2R<;sIktV4`@uLy<D&fM@yDjJKyxEyuQB`H5R2301aBHm*U>ryCJm>v>
zf8hpc`FWZq?)N*xFyJ`O|4INwQBc=4S(f2>o-yVZNkk~il7H9hMVh7@4u@4=yWjIZ
z9uKOjB93FiFx(DedFZ;1vMdRLfaCGFNdT}!1Xaa#UC!q-pU;Qq^T~p*)o$?ua5|kB
zhJm6e*zfoFzQ3wyL>@&EVHk3|-DsL-RndrCL`aeZ*LAsGue5Dz5RJ%H72CGCTrSwQ
oP2cy1C;994<{Np&vdsPe05Nuf_%5t482|tP07*qoM6N<$f?QFG^Z)<=

diff --git a/examples/example1/res/scrollbar_btn_right.png b/examples/example1/res/scrollbar_btn_right.png
index 1cfc95f6ba1b63846bd08cebea091fb9582fdfeb..081a183bfdc94774188c5fcbefa1d2a3c40f8746 100644
GIT binary patch
delta 284
zcmV+%0ptGN0^tIXPJb8%B@<pPKhyvK0P{&iK~yNuV_?7p%nU>VCI$uu25YZr|BdV$
zcQG(92qBAORSX0F{{CLZ$t~(?WZ$@gfq{X8fq~&4HjRvE2K=*dpRkOXnJx0i_qW^6
z?yvQMnTJagT%);L-%1u1j<BCUK5RL&ugVvnO(+`8T)Nk=vVU<0|N8lP!|A={!N@i;
z;t804#tzNfIk<#9{{8*E?D)?7XqY%2o4VGrvhf7{{`GnNsXgT(_-ums$+dSC3oB>n
zuOA;apWavHhi)nhj?fGJ`TgCtGy7}&VB*-~2{pLCz20?Ze@zhHlmJgZPz`4f)Q2%J
iF#N=33sDAP0~G)fm0$MLK>K9?0000<MNUMnLSTYR(TlJE

delta 280
zcmV+z0q6eV0^I_TPJb5)5gAmg%ntwn0PjgeK~yNug_1FggfI|=U&Km9v9hwT5X)34
z6#V6uf{Tqd78YU|?X-v>1k6?mw|Bbt$~W`PB#$9VDTQCUt_zlB;Yp^V*=1Q!RTYlo
z`0#HbE!TA+r9{&-kWzvW@&`1KF8aQYvMeElK-;$eZ_;281b--s0-SU7eGfv&_vdLa
ziXt$^FwZl_afDLJY`u+0gGrJgiXsfd03n3&Zy}`=2qBoJ3G2FoQVP%WjBh^yoO5(t
zhb+sGrs?yaG_Y+OUauG8I0mKkIdTo``;NM<5r!ccW8W`A>pV|5j)OeUVcWJD_7T+G
e?cFv0)Em(bhY{ffhjBOn0000<MNUMnLSTYa4}IzY

diff --git a/examples/example1/res/scrollbar_btn_up.png b/examples/example1/res/scrollbar_btn_up.png
index b591185298470f4a251e78600c7f4f0eb50feea7..1a229062e2def10e2a14b4817488b3c848b857d6 100644
GIT binary patch
delta 302
zcmV+}0nz^C0`mfpPJb8%BslAe_tgLZ0R>4!K~yNuV_={%U?Nuo6G^67x=&n6j1!n(
zd{gJnwM@*cQD!ckYtZG;o$-%>fq}uqsckbGJ8!^`Z*O<7vhfC*I<;+r%Kd|>hiUr9
zz`(#^?AW}8okPIq_ph&O&mO4t{Qc|8IyMdgUlYfctqcqd?0+zWnW375jO-iNa&n2d
z|M~M{)v4VjVGIlmOi%CaUMZ#Eq|L_87a%5WX7>ESfz1pI3_lqe7#Nt1>>Iapa*MkD
z{rhYAiJb*eNX}(qU|{%X;XYv*Gc#M{k8iJcojp+R$;80G@RyTY)b-!r-^<W6z?{u=
zVrN0r-@m_>b0=_#x*^FCi~^kT#Y9AeGm)LX0Lord)k!ipY5)KL07*qoM6N<$f^mtM
AD*ylh

delta 287
zcmV+)0pR}g0^|aaPJb5)5d}c1kU#(c0QN~lK~yNuoszMRf>01e&lnnM3>7sWK_Lm1
zUri`YG&Tei8xrbANeE~|^jhiSE?Dg8-rU@IlRIOQ#0-)!vpI>?H^V}|c@se2_e;``
zNz%J>RaInJMqSr`w6|$Ge^C@%E*HWuq%2F$=QC#ZF|G$-W`B(1$mw*#IY%7FL{UUt
z*Azv;?RF!MV?56Tz$EE<y>d7l7>0o)NeIL6{kwCH<MBuk1Z=lk*6THPzu%STIpa8z
zrYW1v<|92bqitLE`#rwzv)k=JlALqux=xbxcsw-a^={i%P18t{Y`WZ~h5oL4ui`6^
lIi|^(8Mbsr-xyf&51uV=w~+rsLOcKf002ovPDHLkV1j}ng(Uz0

diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d
index 873ef4fc..67fabb90 100644
--- a/src/dlangui/widgets/controls.d
+++ b/src/dlangui/widgets/controls.d
@@ -116,6 +116,7 @@ class ImageButton : ImageWidget {
     this(string ID = null, string drawableId = null) {
         super(ID);
         styleId = "BUTTON";
+        _drawableId = drawableId;
     }
 }
 
@@ -153,6 +154,7 @@ class Button : Widget {
 class ScrollBar : WidgetGroup {
     protected ImageButton _btnBack;
     protected ImageButton _btnForward;
+    protected int _btnSize;
 
     protected Orientation _orientation = Orientation.Vertical;
     /// returns scrollbar orientation (Vertical, Horizontal)
@@ -168,24 +170,76 @@ class ScrollBar : WidgetGroup {
         return this; 
     }
 
-    this(string ID = null, Orientation orientation = Orientation.Vertical) {
+    this(string ID = null, Orientation orient = Orientation.Vertical) {
 		super(ID);
         styleId = "BUTTON";
-        _orientation = orientation;
+        _orientation = orient;
         _btnBack = new ImageButton("BACK", _orientation == Orientation.Vertical ? "scrollbar_btn_up" : "scrollbar_btn_left");
         _btnForward = new ImageButton("FORWARD", _orientation == Orientation.Vertical ? "scrollbar_btn_down" : "scrollbar_btn_right");
+        addChild(_btnBack);
+        addChild(_btnForward);
     }
 
     override void measure(int parentWidth, int parentHeight) { 
         Point sz;
         _btnBack.measure(parentWidth, parentHeight);
         _btnForward.measure(parentWidth, parentHeight);
+        _btnSize = _btnBack.measuredWidth;
+        if (_btnSize < _btnBack.measuredHeight)
+            _btnSize = _btnBack.measuredHeight;
+        if (_btnSize < 16)
+            _btnSize = 16;
         if (_orientation == Orientation.Vertical) {
             // vertical
+            sz.x = _btnSize;
+            sz.y = _btnSize * 5; // min height
         } else {
             // horizontal
-
+            sz.y = _btnSize;
+            sz.x = _btnSize * 5; // min height
         }
         measuredContent(parentWidth, parentHeight, sz.x, sz.y);
     }
+
+    override void layout(Rect rc) {
+        applyMargins(rc);
+        applyPadding(rc);
+        Rect r;
+        if (_orientation == Orientation.Vertical) {
+            // vertical
+            int backbtnpos = rc.top + _btnSize;
+            int fwdbtnpos = rc.bottom - _btnSize;
+            r = rc;
+            r.bottom = backbtnpos;
+            _btnBack.layout(r);
+            r = rc;
+            r.top = fwdbtnpos;
+            _btnForward.layout(r);
+        } else {
+            // horizontal
+            int backbtnpos = rc.left + _btnSize;
+            int fwdbtnpos = rc.right - _btnSize;
+            r = rc;
+            r.right = backbtnpos;
+            _btnBack.layout(r);
+            r = rc;
+            r.left = fwdbtnpos;
+            _btnForward.layout(r);
+        }
+        _pos = rc;
+        _needLayout = false;
+    }
+
+    /// Draw widget at its position to buffer
+    override void onDraw(DrawBuf buf) {
+        if (visibility != Visibility.Visible)
+            return;
+        super.onDraw(buf);
+        Rect rc = _pos;
+        applyMargins(rc);
+        applyPadding(rc);
+        ClipRectSaver(buf, rc);
+        _btnForward.onDraw(buf);
+        _btnBack.onDraw(buf);
+    }
 }