From e48a6be31171630a1a395e4c217f7e4ba3b9f8f8 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 16 Jan 2015 17:42:05 +0300
Subject: [PATCH] additional tab control styles

---
 res/mdpi/tab_btn_dark_up_focused.9.png        | Bin 0 -> 189 bytes
 .../tab_btn_dark_up_focused_selected.9.png    | Bin 0 -> 184 bytes
 res/mdpi/tab_btn_dark_up_hover.9.png          | Bin 0 -> 189 bytes
 res/mdpi/tab_btn_dark_up_normal.9.png         | Bin 0 -> 189 bytes
 res/mdpi/tab_btn_dark_up_selected.9.png       | Bin 0 -> 188 bytes
 res/mdpi/tab_up_background_dark_focused.9.png | Bin 0 -> 187 bytes
 res/mdpi/tab_up_background_dark_normal.9.png  | Bin 0 -> 193 bytes
 res/tab_btn_dark_up.xml                       |  20 +++++++++++++
 res/tab_up_background_dark.xml                |   8 +++++
 res/theme_default.xml                         |  17 +++++++++++
 src/dlangui/widgets/tabs.d                    |  28 +++++++++++++++++-
 11 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 res/mdpi/tab_btn_dark_up_focused.9.png
 create mode 100644 res/mdpi/tab_btn_dark_up_focused_selected.9.png
 create mode 100644 res/mdpi/tab_btn_dark_up_hover.9.png
 create mode 100644 res/mdpi/tab_btn_dark_up_normal.9.png
 create mode 100644 res/mdpi/tab_btn_dark_up_selected.9.png
 create mode 100644 res/mdpi/tab_up_background_dark_focused.9.png
 create mode 100644 res/mdpi/tab_up_background_dark_normal.9.png
 create mode 100644 res/tab_btn_dark_up.xml
 create mode 100644 res/tab_up_background_dark.xml

diff --git a/res/mdpi/tab_btn_dark_up_focused.9.png b/res/mdpi/tab_btn_dark_up_focused.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..293820e7b50c1c68ec05adf40a2002e7c24c0afb
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpQuz*kB1;o$jj5kF~s6@vdQPu=?Oq!u{HBi
zJ)2O&%y>IxW*|_$!Z681nbFOSjjip!LHGnNzuZ|T4jge%lrT-W(r_@5;pogx)?*6h
b*31m+jtTrQd-n4T&{PIbS3j3^P6<r_Lmo9I

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_btn_dark_up_focused_selected.9.png b/res/mdpi/tab_btn_dark_up_focused_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7179ad96d06e8f2ada079e39130cb4eaa0362759
GIT binary patch
literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpP2cZI``#3Ay-cq#}JFtZznGlWKiHa@=0cv
z>dbD{-42Ea61mwN|2)6vlE=$1^%YA&Hq!-xmSfUF4?eqA#A<bV?|Z;~Pax*_l<?4Y
a%ktaSq9?g*V$^^JGI+ZBxvX<aXaWF7!Ztnt

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_btn_dark_up_hover.9.png b/res/mdpi/tab_btn_dark_up_hover.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bcd560fcaff98e696ec7a541ab9c1abc56d6b5f
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpSW35l3M{#$jj5kF~s6@vdQPu=?Oq!u{HBi
zJ)2O&%y>IxW*|_$!Z681nbFOSjjip!LHGnNzuZ|T4jge%lrT-W(r_@5;pogx)?*6h
b*31m+jtTrQd-n4T&{PIbS3j3^P6<r_VwE*_

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_btn_dark_up_normal.9.png b/res/mdpi/tab_btn_dark_up_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5253ab6a5d3572d03ef1847cf9b1f3c4c83e0e9
GIT binary patch
literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpQMzYCA%z8$jj5kF~s6@vdQPu=?Oq!u{HBi
zJ)2O&%y>IxW*|_$!Z681nbFOSjjip!LHGnNzuZ|T4jge%lrT-W(r_@5;pogx)?*6h
b*31m+jtTrQd-n4T&{PIbS3j3^P6<r_?YJ~f

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_btn_dark_up_selected.9.png b/res/mdpi/tab_btn_dark_up_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca629bf7d41b8130c9ef506b4cdb03d97be5e85
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpOnOFDbr6tAx}>i#}JFt$zOakk`jR6#-0W5
z?3p<am@n*{*a!rISqz@DCNd~1GczBqpP}u+I$QjTp@Crlha0biX+nX7Lt$D{qv46O
a=NM)^5nS`{UCno(p$wj`elF{r5}E+OEjH5t

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_up_background_dark_focused.9.png b/res/mdpi/tab_up_background_dark_focused.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..90c8b6b21b0cdc3c79cd76078a949edc49b5c0c8
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rAHSAJMN=A3$ivgcF~sBe+o^%P3<@Gl{LB%T
zVy105@cA;+qi4rhA3WeL)Oe>97kKW&Grjj>0*)+#E&>PnfBbjYy6mmlRrd2@3+&dd
eTVcw&f$>Kw-==U|z6n4x89ZJ6T-G@yGywnwMmWL%

literal 0
HcmV?d00001

diff --git a/res/mdpi/tab_up_background_dark_normal.9.png b/res/mdpi/tab_up_background_dark_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..30b65db8b22e02842f8b77f3229a8405106ef589
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE(~T2ehm2q+FDUS5zYdS
z$YKTt?oJS9G(UNIEl`lX#M9T6{XU}rpR~yD?H)6LLVlhujv*e$lT#cT{_|X6?cw>t
z^glDxLU^sLe>S&-o36yxgey&f+&~6b!?&-D-819u&hprA%~X2(xIyq)bMS1npsk<G
hKc7xdNk~XwU@$G?k-l@}2M5q(22WQ%mvv4FO#nO<Is^a!

literal 0
HcmV?d00001

diff --git a/res/tab_btn_dark_up.xml b/res/tab_btn_dark_up.xml
new file mode 100644
index 00000000..277b6076
--- /dev/null
+++ b/res/tab_btn_dark_up.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:constantSize="true"
+  android:dither="false"
+  android:variablePadding="false" >
+  <item
+    android:drawable="tab_btn_dark_up_hover"
+    android:state_hovered="true" />
+  <item
+    android:drawable="tab_btn_dark_up_selected_focused"
+    android:state_selected="true" android:state_window_focused="true" />
+  <item
+    android:drawable="tab_btn_dark_up_focused"
+    android:state_window_focused="true" />
+  <item
+    android:drawable="tab_btn_dark_up_selected"
+    android:state_selected="true" />
+  <item
+    android:drawable="tab_btn_dark_up_normal" />
+</selector>
diff --git a/res/tab_up_background_dark.xml b/res/tab_up_background_dark.xml
new file mode 100644
index 00000000..4e23a9cf
--- /dev/null
+++ b/res/tab_up_background_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:drawable="tab_up_background_dark_focused"
+    android:state_window_focused="true" />
+  <item
+    android:drawable="tab_up_background_dark_normal" />
+</selector>
diff --git a/res/theme_default.xml b/res/theme_default.xml
index 1ace59f3..5b7c88c4 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -102,6 +102,23 @@
         <state state_hovered="true" backgroundColor="#F0404080"/>
     </style>
 
+    <style id="TAB_UP_DARK"
+        backgroundImageId="tab_up_background_dark"
+        layoutWidth="FILL_PARENT"
+        >
+    </style>
+    <style id="TAB_UP_BUTTON_DARK"
+        backgroundImageId="tab_btn_dark_up"
+        />
+    <style id="TAB_UP_BUTTON_DARK_TEXT"
+        textColor="#000000"
+        align="Center"
+        >
+        <state state_selected="true" state_focused="true" textColor="#000000"/>
+        <state state_selected="true" textColor="#000000"/>
+        <state state_focused="true" textColor="#000000"/>
+        <state state_hovered="true" textColor="#808000"/>
+    </style>
     <style id="TAB_UP"
         backgroundImageId="tab_up_background"
         layoutWidth="FILL_PARENT"
diff --git a/src/dlangui/widgets/tabs.d b/src/dlangui/widgets/tabs.d
index 98743cd8..8491f84e 100644
--- a/src/dlangui/widgets/tabs.d
+++ b/src/dlangui/widgets/tabs.d
@@ -94,6 +94,10 @@ class TabItemWidget : HorizontalLayout {
 		clickable = true;
         trackHover = true;
     }
+    void setStyles(string tabButtonStyle, string tabButtonTextStyle) {
+        styleId = tabButtonStyle;
+        _label.styleId = tabButtonTextStyle;
+    }
     protected bool onClick(Widget source) {
         if (source.compareId("CLOSE")) {
             Log.d("tab close button pressed");
@@ -185,6 +189,9 @@ class TabControl : WidgetGroupDefaultDrawing {
     protected bool _enableCloseButton;
     protected TabItemWidget[] _sortedItems;
 
+    protected string _tabStyle;
+    protected string _tabButtonStyle;
+    protected string _tabButtonTextStyle;
 
 	/// signal of tab change (e.g. by clicking on tab header)
 	Signal!TabHandler onTabChangedListener;
@@ -196,15 +203,28 @@ class TabControl : WidgetGroupDefaultDrawing {
     /// create with ID parameter
     this(string ID) {
         super(ID);
+        setStyles(STYLE_TAB_UP, STYLE_TAB_UP_BUTTON, STYLE_TAB_UP_BUTTON_TEXT);
         _items = new TabItemList();
         _moreButton = new ImageButton("MORE", "tab_more");
         _moreButton.styleId = STYLE_BUTTON_TRANSPARENT;
         _moreButton.onClickListener = &onClick;
         _moreButton.margins(Rect(3,3,3,6));
         _enableCloseButton = true;
-        styleId = STYLE_TAB_UP;
+        styleId = _tabStyle;
         addChild(_moreButton); // first child is always MORE button, the rest corresponds to tab list
     }
+    void setStyles(string tabStyle, string tabButtonStyle, string tabButtonTextStyle) {
+        _tabStyle = tabStyle;
+        _tabButtonStyle = tabButtonStyle;
+        _tabButtonTextStyle = tabButtonTextStyle;
+        styleId = _tabStyle;
+        for (int i = 1; i < _children.count; i++) {
+            TabItemWidget w = cast(TabItemWidget)_children[i];
+            if (w) {
+                w.setStyles(_tabButtonStyle, _tabButtonTextStyle);
+            }
+        }
+    }
     /// returns tab count
     @property int tabCount() const {
         return _items.length;
@@ -272,6 +292,7 @@ class TabControl : WidgetGroupDefaultDrawing {
         TabItemWidget widget = new TabItemWidget(item, enableCloseButton);
         widget.parent = this;
         widget.onClickListener = &onClick;
+        widget.setStyles(_tabButtonStyle, _tabButtonTextStyle);
         _children.insert(widget, index);
         updateTabs();
         requestLayout();
@@ -560,6 +581,11 @@ class TabWidget : VerticalLayout, TabHandler {
 		return _tabControl.tabIndex(id);
 	}
 
+    /// change style ids
+    void setStyles(string tabStyle, string tabButtonStyle, string tabButtonTextStyle) {
+        _tabControl.setStyles(tabStyle, tabButtonStyle, tabButtonTextStyle);
+    }
+
     private bool _tabNavigationInProgress;
 
     /// process key event, return true if event is processed.