From bf97ece83f5f00fef98b41b648772e1d5d132b08 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <buggins@fromru.com>
Date: Tue, 1 Apr 2014 18:42:34 +0400
Subject: [PATCH] tabs

---
 examples/example1/main.d                     |  22 +++----
 examples/example1/res/frame_blue.9.png       | Bin 0 -> 215 bytes
 examples/example1/res/tab_btn_up_hover.9.png | Bin 1099 -> 1086 bytes
 src/dlangui/widgets/styles.d                 |   7 ++-
 src/dlangui/widgets/tabs.d                   |  58 +++++++++++++++++--
 src/dlangui/widgets/widget.d                 |   8 ++-
 6 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 examples/example1/res/frame_blue.9.png

diff --git a/examples/example1/main.d b/examples/example1/main.d
index 329a344f..fc9df270 100644
--- a/examples/example1/main.d
+++ b/examples/example1/main.d
@@ -47,16 +47,10 @@ extern (C) int UIAppMain(string[] args) {
     Window window = Platform.instance().createWindow("My Window", null);
 	
 	static if (true) {
-		LinearLayout layout = new LinearLayout();
-
         TabWidget tabs = new TabWidget("TABS");
-        tabs.addTab((new TextWidget()).id("tab1").textColor(0x00802000).text("Tab 1 contents"), "Tab 1"d);
-        tabs.addTab((new TextWidget()).id("tab2").textColor(0x00802000).text("Tab 2 contents"), "Tab 2"d);
-        tabs.addTab((new TextWidget()).id("tab3").textColor(0x00802000).text("Tab 3 contents"), "Tab 3"d);
-        tabs.addTab((new TextWidget()).id("tab4").textColor(0x00802000).text("Tab 4 contents"), "Tab 4"d);
-        tabs.addTab((new TextWidget()).id("tab5").textColor(0x00802000).text("Tab 5 contents"), "Tab 5"d);
-        tabs.selectTab("tab1");
-        layout.addChild(tabs);
+        tabs.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
+
+		LinearLayout layout = new LinearLayout("tab1");
 
 		layout.addChild((new TextWidget()).textColor(0x00802000).text("Text widget 0"));
 		layout.addChild((new TextWidget()).textColor(0x40FF4000).text("Text widget"));
@@ -117,7 +111,15 @@ extern (C) int UIAppMain(string[] args) {
 
 		layout.layoutHeight(FILL_PARENT).layoutWidth(FILL_PARENT);
 
-	    window.mainWidget = layout;
+        tabs.addTab(layout, "Tab 1"d);
+        tabs.addTab((new TextWidget()).id("tab2").textColor(0x00802000).text("Tab 2 contents bla bla bla"), "Tab 2"d);
+        tabs.addTab((new TextWidget()).id("tab3").textColor(0x00802000).text("Tab 3 contents"), "Tab 3"d);
+        tabs.addTab((new TextWidget()).id("tab4").textColor(0x00802000).text("Tab 4 contents some long string"), "Tab 4"d);
+        tabs.addTab((new TextWidget()).id("tab5").textColor(0x00802000).text("Tab 5 contents"), "Tab 5"d);
+
+        tabs.selectTab("tab1");
+
+	    window.mainWidget = tabs;
 	} else {
 	    window.mainWidget = (new Button()).text("sample button");
 	}
diff --git a/examples/example1/res/frame_blue.9.png b/examples/example1/res/frame_blue.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..faae7a3f1abb3c6db2f2612edfa9b8f9c23e296d
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^sz5By!3HD~>RC<zDaPU;cPEB*=VV?2Ih+L^k;M!Q
z+?^oIXnykaTA(0%iKnkC`#ly$K4q<A0j<x0LYbZ}jv*0;-`?0L*q|Wba&fQpsfDak
z3mv2vvc47+HWgr2woLz*mXiOi<C@8`*S~LkII;9xgH2j)_fDo`@2|3YlzT=WS;oR8
zq7ksbp^=Fd#Mtj5>AUxasM9?Cxx12MW|);c30j}Og?XPKw?k-7K|Rn?22WQ%mvv4F
FO#r4qMqU5_

literal 0
HcmV?d00001

diff --git a/examples/example1/res/tab_btn_up_hover.9.png b/examples/example1/res/tab_btn_up_hover.9.png
index fa378fe1aac4f0b7db5f5e0c59ff62fa82e6dac2..df0c1f5d5480e0e67b9a10c39b5a56c20588f677 100644
GIT binary patch
delta 1021
zcmV<Z0|NZZ2)+oAPk#;_H42@RZvX%T&`Cr=RA}DKT1{&kF%X@R)f(EShe9Cqn1ByC
z=9V6E&tLT)=|6}e(6f7WDYV|jQZKt@vO8bW${`EEw!D@`qc?Bf%m!h8WqADy;jLdt
zUJ(ESdH)*LXY!ZE_x}xee0;pvY&Ksuo6S{933ASeh=4e^ZGRj?M95h`ZSMP=Gvu5B
z5pxIuo}Zt8?)Up&+wJxM0H-+I7w_-yzdk%X+}+;Zexr+XhDpXsi*sXi{ORfG`);?}
zZMWMU0Q?<|dUttwd3Ak#eV0;NQEv=8dSS#kA@vyN8OfmO`<t7ayTjq|8vuR)Ko^JO
zi#g{H>-G9`-+%YVsh7CLC9g?FO^u;Ot=H=dMEnE*?*Smh0o<$O@rWs<WMPCejPr=)
zAv$(CouKPF0Du($ga80N0Ia&M3j@H##hZpbfk)06`o0f?QGX)Y4U(vM@j9J^PAqv=
zi#q8zM;Z#$C@n&yNb(pY%|*sCT|c}<MjwsB>F&Ik@_%~I3K;skC@?K>Mo#fmdyEz=
zg2XA32fUu}%*XH;F2Yoeaiy4QLXz4zmp`RT<te&I37KlC#z7B!^hqSQ<ftux4?Hy^
z&#LfVa-`<*NwP#*poS8p&1;xqkIj?kO1wB-V-x`#CCoIr#Zx6R*y5?-J*wonl&duL
z>6t4^)_-%y<)sEA$|Tvs^OR%&r>Qu7wG?kvjNXzig!xgGE?m{o$`jV-Xt6G>R%ja1
zFlI#>x2CE*CC}6{bq#?A4d|`arnk32$<y?Pr}~u&P%BA`n6eBjtpy!8(o3wGqtZ5D
z$=@c*vvtL+&F2ETgcYrm;<;C9F~;ct{SocDSbrSlJxXa4V%gsMhzhBKC(jmA)*?+Q
z53&i_iViEht;L;Wj4v=X0)48dYBZFWc<H86N;V~U7g%zH(pa?|u1UlW&YCegwlb_V
zVNaz?oEpUOlvcvmDp0LD3YOAbDoYA}k7h!)D&$sN#oZHX>$R3Zm!c1+3Aq5EO$;7*
z3V+SQK?1kdMD?T=ch9pVI?kO7&qkgVzh|Qlt^QO=gG{USybTVq6~y7EggmA15fSJE
zDzj-OEowbLng)WWWodO?Sa(Yuyc+H0_+DppuMR5VFE8K4T7^)Xkd^!8+-IrHbIBWt
zJkh(m+Jx+F5xM$P5*3sv3CELnoaH|6&UQ7rDADDfUINx;{L+Z?G|{S>X6L@*5(;Qh
z4|3!gYp~=QUxKUXRS6{qR5H2m*-Y!o#yd}3lCx@!Q2rTb-W_fk`b)AwsBO5`R65F>
r^ux!n1P7&$Y28#K-SbL3$*%tog;7C#;HBY000000NkvXXu0mjf{-pAb

delta 1035
zcmV+m1oZp92+IhNPk#mpEjdh$)Bpej-AP12RA}DKTD@)?F$^YUwFZi&LxBK6#{}?@
zF<Uxh&x3UC!*uA-H}H$}4QwDl=X7<^p+3V>m%D(u<DYbLkOP9)@>!y&j~_qsj4-`^
zz{_7>;I&^!{v!Yc@)}=Y{Y?JS@cPMs`}_N|)oS%|wOU=Ilz$-SjED$`Q`?3yM1-8P
zzAE#1&KYvffQUJS01pojzaJkT|E$;R9RM6-e_y=4z5R4|cXxAref^m(&KV{dD=p5A
z(ece@^K-l1ZrAJe76ASYM!h*dKfk!Vyu3*%EvPs89X&H*n2>sm^NeKB`1RG*)y;0V
z`wIZS0HBNg@qfjf^SkA8`QdOl?8jc>7MHvx88tSB8ns+5&k*rF0K5f&5PNVh_WM1i
zl#+!J&M?j+mWSxr@py!;>i_^201yHId<TF<*L9%>xVU)JuqW`yIm6*_2)$9?BH0a+
zsCf2&JPDmx@~jqh(s2$n6sS>Jgh-L(F-V$=jAgohcz=zIJ{X1L-FY$P^_~?l^m|cY
zTHuTv<Ei!-Em#DJQzQ>~J>i*;;W3<rsT$)-G1Y`5wQ(+gN|(x0bdeG=)l!Xv9{A{!
zNN&ziTLABQYC@h>;XUU_&Eu0~iL^isB}kjsFvT95C(o65alFPL0ys*TXmX3EN@TFb
zQ~hgH$$xV$S83|gGgp+X=Z?!u4MvnnvW4d<$pB7Mar$a5-l`bAC0z*fqbgmvs-u-B
ztoPAkU0SWsG^An7iZpIbRe4IDsb%UK0u36_TdPfPZ-bJj=?zcyD;1ztk`^&#8CF^g
zI&h?yST#qbZNQShO_XQridmb_1#}53S|`PGuYb_Md%_fQIG|k@i=(_pDQ!Y5+gl$|
zAyx3?*+R-%q$%Y=HX&QlVTHG~xRZ?W8KwrHkM&fIhVl|G-Be1+rUdT-bB<6NtCqtx
ziP*te6Gq2YhLtAlv2=-JgE*ejO88m@s#Qn9QkrvRNx}EgOvqM++={EXdqQo!))MGa
z^nc+vAr}C&iNQTjp;<Uc;MSU`p48&*d6q=SsdM4U$g|@6Z1kbkpDJmPX|<lW!6CMS
zIQ*25r}Q}@0)0SbHqE3(tp`ZsK=8CIt*#5}ZmEM;qrDuT>x}NzK_&d<<-1s`5NZ>$
za=)DWEVX$mc_Wc0dUscwki9J;SAR;Pf`1Yv;dt_nlicUsxkeWyy4=%Cz}k#o8gZT`
zT2<5R)K{EC0WIo5jyz)xmOSHga235Op~QenCigv?X<gZP=ZSN2R;>}rk8!5m;g+F4
zCmV#?hHFiwqs&R)d<}DOQ2LnGO*O(jFZEkb_V=Ct0Z(#481p0*qW}N^07*qoL<Fuv
FV1hoY|2+Tz

diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 38d06cde..c29960d8 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -646,11 +646,11 @@ Theme createDefaultTheme() {
     tabUp.layoutWidth(FILL_PARENT);
     tabUp.createState(State.Selected, State.Selected).backgroundImageId("tab_up_backgrond_selected");
     Style tabUpButtonText = res.createSubstyle("TAB_UP_BUTTON_TEXT");
-    tabUpButtonText.textColor(0xFFFFFF).fontSize(12);
+    tabUpButtonText.textColor(0xFFFFFF).fontSize(12).alignment(Align.Center);
     tabUpButtonText.createState(State.Selected, State.Selected).textColor(0x000000);
     tabUpButtonText.createState(State.Selected|State.Focused, State.Selected|State.Focused).textColor(0x000000);
     tabUpButtonText.createState(State.Focused, State.Focused).textColor(0x000000);
-    tabUpButtonText.createState(State.Hover, State.Hover).textColor(0x404000);
+    tabUpButtonText.createState(State.Hover, State.Hover).textColor(0xFFE0E0);
     Style tabUpButton = res.createSubstyle("TAB_UP_BUTTON");
     tabUpButton.backgroundImageId("tab_btn_up_normal");
     tabUpButton.createState(State.Selected, State.Selected).backgroundImageId("tab_btn_up_selected");
@@ -659,6 +659,9 @@ Theme createDefaultTheme() {
     tabUpButton.createState(State.Hover, State.Hover).backgroundImageId("tab_btn_up_hover");
     Style tabHost = res.createSubstyle("TAB_HOST");
     tabHost.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
+    tabHost.backgroundColor(0xF0F0F0);
+    Style tabWidget = res.createSubstyle("TAB_WIDGET");
+    tabWidget.backgroundImageId("frame_blue");
 	//res.dumpStats();
 	return res;
 }
diff --git a/src/dlangui/widgets/tabs.d b/src/dlangui/widgets/tabs.d
index f78bc47a..0ed57104 100644
--- a/src/dlangui/widgets/tabs.d
+++ b/src/dlangui/widgets/tabs.d
@@ -3,6 +3,10 @@ module dlangui.widgets.tabs;
 import dlangui.widgets.layouts;
 import dlangui.widgets.controls;
 
+interface TabHandler {
+    void onTabChanged(string newActiveTabId, string previousTabId);
+}
+
 class TabItem {
     private string _iconRes;
     private string _id;
@@ -140,6 +144,10 @@ class TabControl : WidgetGroup {
     protected bool _enableCloseButton;
     protected TabItemWidget[] _sortedItems;
 
+    protected void delegate(string newActiveTabId, string previousTabId) _onTabChanged;
+    @property void delegate(string newActiveTabId, string previousTabId) onTabChangedListener() { return _onTabChanged; }
+    @property TabControl onTabChangedListener(void delegate(string newActiveTabId, string previousTabId) listener) { _onTabChanged = listener; return this; }
+
     this(string ID) {
         super(ID);
         _items = new TabItemList();
@@ -307,29 +315,56 @@ class TabControl : WidgetGroup {
 		}
     }
 
+    protected string _selectedTabId;
+
     void selectTab(int index) {
+        if (_children.get(index + 1).compareId(_selectedTabId))
+            return; // already selected
+        string previousSelectedTab = _selectedTabId;
 		for (int i = 1; i < _children.count; i++) {
             if (index == i - 1) {
                 _children.get(i).state = State.Selected;
+                _selectedTabId = _children.get(i).id;
             } else {
                 _children.get(i).state = State.Normal;
             }
         }
+        if (_onTabChanged !is null)
+            _onTabChanged(_selectedTabId, previousSelectedTab);
     }
 }
 
 /// container for widgets controlled by TabControl
-class TabHost : FrameLayout {
-    this(string ID, TabControl tabControl) {
+class TabHost : FrameLayout, TabHandler {
+    this(string ID, TabControl tabControl = null) {
         super(ID);
         _tabControl = tabControl;
+        if (_tabControl !is null)
+            _tabControl.onTabChangedListener = &onTabChanged;
         styleId = "TAB_HOST";
     }
     protected TabControl _tabControl;
     /// get currently set control widget
     @property TabControl tabControl() { return _tabControl; }
     /// set new control widget
-    @property TabHost tabControl(TabControl newWidget) { _tabControl = newWidget; return this; }
+    @property TabHost tabControl(TabControl newWidget) { 
+        _tabControl = newWidget; 
+        if (_tabControl !is null)
+            _tabControl.onTabChangedListener = &onTabChanged;
+        return this;
+    }
+
+    protected void delegate(string newActiveTabId, string previousTabId) _onTabChanged;
+    @property void delegate(string newActiveTabId, string previousTabId) onTabChangedListener() { return _onTabChanged; }
+    @property TabHost onTabChangedListener(void delegate(string newActiveTabId, string previousTabId) listener) { _onTabChanged = listener; return this; }
+
+    protected override void onTabChanged(string newActiveTabId, string previousTabId) {
+        if (newActiveTabId !is null) {
+            showChild(newActiveTabId);
+        }
+        if (_onTabChanged !is null)
+            _onTabChanged(newActiveTabId, previousTabId);
+    }
 
     /// remove tab
     TabHost removeTab(string id) {
@@ -348,6 +383,7 @@ class TabHost : FrameLayout {
         assert(widget.id !is null, "ID for tab host page is mandatory");
         assert(_children.indexOf(id) == -1, "duplicate ID for tab host page");
         _tabControl.addTab(widget.id, label, iconId, enableCloseButton);
+        addChild(widget);
         return this;
     }
     /// add new tab by id and label string resource id
@@ -356,7 +392,7 @@ class TabHost : FrameLayout {
         assert(widget.id !is null, "ID for tab host page is mandatory");
         assert(_children.indexOf(id) == -1, "duplicate ID for tab host page");
         _tabControl.addTab(widget.id, labelResourceId, iconId, enableCloseButton);
-        TabItem item = new TabItem(id, labelResourceId);
+        addChild(widget);
         return this;
     }
     /// select tab
@@ -369,16 +405,28 @@ class TabHost : FrameLayout {
 }
 
 /// compound widget - contains from TabControl widget (tabs header) and TabHost (content pages)
-class TabWidget : VerticalLayout {
+class TabWidget : VerticalLayout, TabHandler {
     protected TabControl _tabControl;
     protected TabHost _tabHost;
     this(string ID) {
         super(ID);
         _tabControl = new TabControl("TAB_CONTROL");
         _tabHost = new TabHost("TAB_HOST", _tabControl);
+        styleId = "TAB_WIDGET";
         addChild(_tabControl);
         addChild(_tabHost);
     }
+
+    protected void delegate(string newActiveTabId, string previousTabId) _onTabChanged;
+    @property void delegate(string newActiveTabId, string previousTabId) onTabChangedListener() { return _onTabChanged; }
+    @property TabWidget onTabChangedListener(void delegate(string newActiveTabId, string previousTabId) listener) { _onTabChanged = listener; return this; }
+
+    protected override void onTabChanged(string newActiveTabId, string previousTabId) {
+        // forward to listener
+        if (_onTabChanged !is null)
+            _onTabChanged(newActiveTabId, previousTabId);
+    }
+
     /// add new tab by id and label string resource id
     TabWidget addTab(Widget widget, string labelResourceId, string iconId = null, bool enableCloseButton = false) {
         _tabHost.addTab(widget, labelResourceId, iconId, enableCloseButton);
diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d
index e1b4e2f8..c2cb4249 100644
--- a/src/dlangui/widgets/widget.d
+++ b/src/dlangui/widgets/widget.d
@@ -283,11 +283,13 @@ class Widget {
     /// returns widget visibility (Visible, Invisible, Gone)
     @property Visibility visibility() { return _visibility; }
     /// sets widget visibility (Visible, Invisible, Gone)
-    @property Widget visibility(Visibility visible) { 
+    @property Widget visibility(Visibility visible) {
         if (_visibility != visible) {
             if ((_visibility == Visibility.Gone) || (visible == Visibility.Gone))
-                _visibility = visible; 
-            requestLayout();
+                requestLayout();
+            else
+                invalidate();
+            _visibility = visible;
         }
         return this;
     }