From 05165a5b18b063179432359b5eb4dbae462b238b Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 14 Jan 2015 09:56:11 +0300
Subject: [PATCH] new button style for default theme

---
 res/btn_background.xml             |  18 ++++++++++++++++++
 res/btn_background_transparent.xml |  17 +++++++++++++++++
 res/mdpi/btn_default.9.png         | Bin 0 -> 532 bytes
 res/mdpi/btn_disabled.9.png        | Bin 0 -> 354 bytes
 res/mdpi/btn_hover.9.png           | Bin 0 -> 461 bytes
 res/mdpi/btn_normal.9.png          | Bin 0 -> 412 bytes
 res/mdpi/btn_pressed.9.png         | Bin 0 -> 537 bytes
 res/theme_default.xml              |   6 +++---
 src/dlangui/graphics/resources.d   |   1 +
 src/dlangui/widgets/styles.d       |   8 ++++----
 10 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 res/btn_background.xml
 create mode 100644 res/btn_background_transparent.xml
 create mode 100644 res/mdpi/btn_default.9.png
 create mode 100644 res/mdpi/btn_disabled.9.png
 create mode 100644 res/mdpi/btn_hover.9.png
 create mode 100644 res/mdpi/btn_normal.9.png
 create mode 100644 res/mdpi/btn_pressed.9.png

diff --git a/res/btn_background.xml b/res/btn_background.xml
new file mode 100644
index 00000000..066aed5b
--- /dev/null
+++ b/res/btn_background.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_pressed" />
+    <item android:state_focused="true" android:state_default="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_normal" />
+    <item android:state_enabled="true" android:state_default="true"
+        android:drawable="@drawable/btn_default" />
+    <item android:state_enabled="true" android:state_hovered="true"
+        android:drawable="@drawable/btn_hover" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_normal" />
+    <item
+        android:drawable="@drawable/btn_disabled" />
+</selector>
+
diff --git a/res/btn_background_transparent.xml b/res/btn_background_transparent.xml
new file mode 100644
index 00000000..f96baa91
--- /dev/null
+++ b/res/btn_background_transparent.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item
+    android:drawable="btn_disabled"
+    android:state_enabled="false"/>
+  <item
+    android:drawable="@null"
+    android:state_focused="true" />
+  <item
+    android:drawable="btn_pressed"
+    android:state_pressed="true" />
+  <item
+    android:drawable="btn_hover"
+    android:state_hovered="true" />
+  <item
+    android:drawable="@null" />
+</selector>
diff --git a/res/mdpi/btn_default.9.png b/res/mdpi/btn_default.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cbe49ae4c9eddbe1ed81da56db61a1590f5ea9c
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJH=EIWR*q~QPn0ij7m
zK~zY`wU#|@Q$ZAkzcEkpPZZ_J5Jh_64WvjAxClaQAZd`d09$a!4p>5fB_Nt)0~CM+
z7EqXu2C$S+FqUQVg6w-JLclf;BXJ+M8;$0EI&;qa1b`SL=ar_Za8!&j%#Oo3;7RYJ
z4&MwI#1l_{vb4_bcE;^%R{}r+@c88iJ$m<r<mL|5)rJdjJo?Im7q2msI_*|S01n;`
zNN(L=^J0x|Gj{>*S8Mclu5$478J%{E1klkir@GRh+stWRaP_C#{Knn9!O<`$O;aVa
zlai2pfW`I6;-s7eDHH>QN>U(%{-D4N3r>KsM8O>U9|1pl{jNYInydl^lgX6fXbcq}
zU}!Lz)PIhh?fzcLocm@Nev@aTK9?dZ!2{Eh6q$sXoPdB3p(sUW#<b!DSSU`BB&-Av
z%+79vQ0RdPqXY%Z?;^Pm+TuwL8*4Rv8t3e<T;fjU*adiK>u8*_u~s9-c=n?0ZDs8D
z`n<os$-VkzpMsN9D!o2?TiLHI>a<&7D(Ud~D?X1-U4Zq~D!bbmopvkC{VM*~x8*xM
WmE~9wCSisE0000<MNUMnLSTZUn&@Z%

literal 0
HcmV?d00001

diff --git a/res/mdpi/btn_disabled.9.png b/res/mdpi/btn_disabled.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7722ed2260daef5cd5ededd1f5a4ebd678483ca0
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBk#$J~mx5Nx7G@K%w`ZE{-7{$KPJt=yk+F;Mm9iIW1?`
z6+CmaSuFVQ30G|@_rXI>f`I}`4{IiTJ)jc3Be`%+#n-CXeR;Ef8eXko5^zeGy=v8z
zo)&>8?{%UdJY9R$&@ITz^0(o!fT+_?U6uDAIQw?4+}X4_SC7k7&1bFoYWw~!`~26Y
z;ip?=7;2Wg1fMTlmm+gq=YX|)@cEtfHMe3|R;+roSNWJnUQ$oR`+(3@tAY;CGiDSv
z0HOb^9UT|GGhe&)ruACXuQ~@84#gb1s6de|ce_4c7M`QMxgk*^bGN8#;2XQY?a#w~
sH5bkb)e;cwF^tg{-^Bc8^|n6@E3U^{-IbNx2=qFGr>mdKI;Vst023;YrvLx|

literal 0
HcmV?d00001

diff --git a/res/mdpi/btn_hover.9.png b/res/mdpi/btn_hover.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f50cd26fa46c85b16377fe0a1902ae9e9dc38d9
GIT binary patch
literal 461
zcmV;;0W$uHP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJH=E;B+|PEh~=0a{5!
zK~zY`y_UUB0znYR|GOL}9En*!AQ&lq00^ZOy)nK3l?hr}5nn+%VxzRafeEct_R`y;
z2|*o5?u>lQSP<YaQ0<<ROtQPh{N^*Wiii*uV~oH;h)6~6Y7VG9Jj*LFMiaKNk1bE*
z$Y|6n$7%t%Y_?@*Zy&YO0uFc6R)FqjfcoPLzCQZ6tCp1q0B>OeH|IrUw|&r$Rfdo=
zX<VNbQMr8r0BB>3un2O-$6zdAz)A<>nJpH9F-E)vS^&0l9#LC!@uF`m;>f;Q515Mc
z0G0qa1YjLN9M(WK)gaasjTq>L$_XHwTAnpxmOnLc)TXkjO<CfrfdH6Di~xu@iy+#k
z|Cl0i2-rMm?jz7dq_kG(QGik=31+d<QYMKW1<+c7h-Mot?=u>$4z5lLDCbjF-uH*!
zXtX-W`@FjJFPd$64-?kIrj^2hKgE5utX2SVeOrD3xS;BRJ<t+&00000NkvXXu0mjf
DiCeZR

literal 0
HcmV?d00001

diff --git a/res/mdpi/btn_normal.9.png b/res/mdpi/btn_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..816d6a40ba734486b065c42873d562a60c63e8bc
GIT binary patch
literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYYs>cdx@v7EBk#$J~n-o8xwzBXJBB|^mK6y@i_i=+Qu#>LlIa1BMR$$
z&)n#^@zYzW?2y^Iz4tdX?cKWeXwB5t-n>OeErdSiZq$g1NKNDZ7{<x}PVsx|9u0=~
zw&9Y=EgY5aul|jTWjy^f$ZR(6^2?gX=0~k{+kH39L~5n<gKD$M{Z(@hCOE9V+QpQ!
zJvwZ)=*^EOu2-yC#bCc%c0N$G#3r3?rig4wzV<WEiy5>US_C#+oAlgr<EhUw*}94>
zJ%&Mh#avhf7joSF9Wr0E>(YNlmzL8{KlQz^d{ARoY$3yCm}?@ny|i`GSAoDl-@1p{
zQCTkQ3!65@1uxwy_FQJJU;Ec8+0=V)%L>me+<L6~zxl;UDvG|rzy8|ojnn7aaR0sM
z<tZwja_#?;HVQnKQEbs@xHc<o^T`yWK>mhJ`*in*<*m8TCa!)C7>*2{u6{1-oD!M<
DKqspk

literal 0
HcmV?d00001

diff --git a/res/mdpi/btn_pressed.9.png b/res/mdpi/btn_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6084c61d211d7af635a6a921a3f78dd5d6320664
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-vJH=Fez(#i1Yve0j5br
zK~zY`wU)nY6hRn<pPB4t3350mT#=xJ;BhP#R^~5Ao6f=_*xHJ<g;=B(E5TM$*xTlx
zI0zhvieO=(m<hQYnVnx2=Pe6vigV{)*kP81_nG(GkKq$qYnoC@MLI}pEt>B_Yt3Xb
z;l<mJ@v0aQWZuOe87#NVPu@I#BFeH{01lqLj>VmA4)^!y_qN!~bA%8p8OIo@tR;wy
zlhZNg_YY3rzY-aM*&6V8e~(8GA5e~lNGbmd;GAdr`3pw}@a~gaBvML6Hgbl$cPU3h
zx@t7M&!B%BHgc3wF<XAvED8eR?`f9Hsy{&1UQ5-00Qgwv?UW)k_BFr-uz@6U;YL7Q
zCm>>dDnPse5Y`EZ2?32Jk*ryDg0H$F{4z;Qzv=2<fb|jU)AVVxSsH+Vaj5{I4dAJq
zPXzES02eT+0InrL<pRd00aR@Om#{>xQ6dQ-qQ@pOUzErr;=)gAt;J3+V>&+L;&R4p
ze$Cui=9OFRF_!tY;o@?}bbQ86FGFiB#B!=QI{py9pBqBQ>q1Jwy?(*T%cr8ADpHLs
bZKKN{suKzl1+W6000000NkvXXu0mjfahK$F

literal 0
HcmV?d00001

diff --git a/res/theme_default.xml b/res/theme_default.xml
index 8aed3d80..292bc014 100644
--- a/res/theme_default.xml
+++ b/res/theme_default.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <theme id="theme_default" fontSize="15" >
     <style id="BUTTON"
-        backgroundImageId="btn_default_small"
+        backgroundImageId="btn_background"
         align="Center"
         margins="5,5,5,5"
         />
     <style id="BUTTON_TRANSPARENT"
-        backgroundImageId="btn_default_small_transparent"
+        backgroundImageId="btn_background_transparent"
         align="Center"
         />
     <style id="BUTTON_LABEL"
@@ -31,7 +31,7 @@
         minHeight="5"
         />
     <style id="BUTTON_NOMARGINS"
-        backgroundImageId="btn_default_small"
+        backgroundImageId="btn_background"
         align="Center"
         />
     <drawable id="scrollbar_button_up" value="scrollbar_btn_up"/>
diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d
index 3db4cb69..973be1ef 100644
--- a/src/dlangui/graphics/resources.d
+++ b/src/dlangui/graphics/resources.d
@@ -348,6 +348,7 @@ void extractStateFlag(ref string[string] attr, string attrName, string attrName2
 void extractStateFlags(ref string[string] attr, ref uint stateMask, ref uint stateValue) {
     extractStateFlag(attr, "state_pressed", "android:state_pressed", State.Pressed, stateMask, stateValue);
     extractStateFlag(attr, "state_focused", "android:state_focused", State.Focused, stateMask, stateValue);
+    extractStateFlag(attr, "state_default", "android:state_default", State.Default, stateMask, stateValue);
     extractStateFlag(attr, "state_hovered", "android:state_hovered", State.Hovered, stateMask, stateValue);
     extractStateFlag(attr, "state_selected", "android:state_selected", State.Selected, stateMask, stateValue);
     extractStateFlag(attr, "state_checkable", "android:state_checkable", State.Checkable, stateMask, stateValue);
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index 78dd3ff1..2d6eab2c 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -749,14 +749,14 @@ Theme createDefaultTheme() {
     }
     //res.fontFace = "Arial Narrow";
     res.fontSize = 15; // TODO: choose based on DPI
-	Style button = res.createSubstyle("BUTTON").backgroundImageId("btn_default_small").alignment(Align.Center).setMargins(5,5,5,5);
-    res.createSubstyle("BUTTON_TRANSPARENT").backgroundImageId("btn_default_small_transparent").alignment(Align.Center);
+	Style button = res.createSubstyle("BUTTON").backgroundImageId("btn_background").alignment(Align.Center).setMargins(5,5,5,5);
+    res.createSubstyle("BUTTON_TRANSPARENT").backgroundImageId("btn_background_transparent").alignment(Align.Center);
     res.createSubstyle("BUTTON_LABEL").layoutWidth(FILL_PARENT).alignment(Align.Left|Align.VCenter);
     res.createSubstyle("BUTTON_ICON").alignment(Align.Center);
     res.createSubstyle("TEXT").setMargins(2,2,2,2).setPadding(1,1,1,1);
     res.createSubstyle("HSPACER").layoutWidth(FILL_PARENT).minWidth(5).layoutWeight(100);
     res.createSubstyle("VSPACER").layoutHeight(FILL_PARENT).minHeight(5).layoutWeight(100);
-	res.createSubstyle("BUTTON_NOMARGINS").backgroundImageId("btn_default_small").alignment(Align.Center); // .setMargins(5,5,5,5)
+    res.createSubstyle("BUTTON_NOMARGINS").backgroundImageId("btn_background").alignment(Align.Center); // .setMargins(5,5,5,5)
 	//button.createState(State.Enabled | State.Focused, State.Focused).backgroundImageId("btn_default_small_normal_disable_focused");
     //button.createState(State.Enabled, 0).backgroundImageId("btn_default_small_normal_disable");
     //button.createState(State.Pressed, State.Pressed).backgroundImageId("btn_default_small_pressed");
@@ -1015,7 +1015,7 @@ bool loadStyleAttributes(Style style, Element elem, bool allowStates) {
  * <?xml version="1.0" encoding="utf-8"?>
  * <theme id="theme_custom" parent="theme_default">
  *   	<style id="BUTTON" 
- * 			backgroundImageId="btn_default_small"
+ * 			backgroundImageId="btn_background"
  * 	 	>
  *   	</style>
  * </theme>