From 9ef54524db56981a51b4861d122233d7137b0f46 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 25 May 2016 14:32:22 +0300 Subject: [PATCH] update default theme --- src/dlangui/platforms/common/platform.d | 7 ++- src/dlangui/widgets/docks.d | 1 + src/dlangui/widgets/tabs.d | 4 +- src/dlangui/widgets/widget.d | 46 ++++++++++++++-- src/dlangui/widgets/winframe.d | 12 +++-- views/res/dock_window_background.xml | 8 +++ .../res/dock_window_background_focused.9.png | Bin 0 -> 331 bytes views/res/dock_window_background_normal.9.png | Bin 0 -> 292 bytes views/res/dock_window_caption_background.xml | 8 +++ .../dock_window_caption_background_down.xml | 8 +++ ...ck_window_caption_background_focused.9.png | Bin 0 -> 287 bytes ...ndow_caption_background_focused_down.9.png | Bin 0 -> 249 bytes ...ock_window_caption_background_normal.9.png | Bin 0 -> 302 bytes ...indow_caption_background_normal_down.9.png | Bin 0 -> 249 bytes views/res/main_menu_background.9.png | Bin 0 -> 255 bytes .../res/mdpi/tab_btn_dark_down_focused.9.png | Bin 195 -> 198 bytes .../tab_btn_dark_down_focused_hover.9.png | Bin 0 -> 266 bytes .../tab_btn_dark_down_focused_selected.9.png | Bin 188 -> 266 bytes views/res/mdpi/tab_btn_dark_down_hover.9.png | Bin 195 -> 443 bytes views/res/mdpi/tab_btn_dark_down_normal.9.png | Bin 195 -> 198 bytes .../res/mdpi/tab_btn_dark_down_selected.9.png | Bin 194 -> 433 bytes views/res/mdpi/tab_btn_dark_up_focused.9.png | Bin 210 -> 298 bytes .../mdpi/tab_btn_dark_up_focused_hover.9.png | Bin 0 -> 304 bytes .../tab_btn_dark_up_focused_selected.9.png | Bin 205 -> 297 bytes views/res/mdpi/tab_btn_dark_up_hover.9.png | Bin 210 -> 427 bytes views/res/mdpi/tab_btn_dark_up_normal.9.png | Bin 210 -> 298 bytes views/res/mdpi/tab_btn_dark_up_selected.9.png | Bin 209 -> 457 bytes views/res/mdpi/toolbar_background.9.png | Bin 252 -> 218 bytes views/res/mdpi/toolbar_host_background.9.png | Bin 0 -> 308 bytes views/res/tab_btn_dark_down.xml | 3 ++ views/res/tab_btn_dark_up.xml | 3 ++ views/res/theme_default.xml | 50 ++++++++++-------- views/standard_resources.list | 12 +++++ 33 files changed, 132 insertions(+), 30 deletions(-) create mode 100644 views/res/dock_window_background.xml create mode 100644 views/res/dock_window_background_focused.9.png create mode 100644 views/res/dock_window_background_normal.9.png create mode 100644 views/res/dock_window_caption_background.xml create mode 100644 views/res/dock_window_caption_background_down.xml create mode 100644 views/res/dock_window_caption_background_focused.9.png create mode 100644 views/res/dock_window_caption_background_focused_down.9.png create mode 100644 views/res/dock_window_caption_background_normal.9.png create mode 100644 views/res/dock_window_caption_background_normal_down.9.png create mode 100644 views/res/main_menu_background.9.png create mode 100644 views/res/mdpi/tab_btn_dark_down_focused_hover.9.png create mode 100644 views/res/mdpi/tab_btn_dark_up_focused_hover.9.png create mode 100644 views/res/mdpi/toolbar_host_background.9.png diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d index e373327e..346e15cd 100644 --- a/src/dlangui/platforms/common/platform.d +++ b/src/dlangui/platforms/common/platform.d @@ -622,8 +622,11 @@ class Window : CustomEventTarget { targetState = State.Focused | State.KeyboardFocused; if (oldFocus is newFocus) return oldFocus; - if (oldFocus !is null) + if (oldFocus !is null) { oldFocus.resetState(targetState); + if (oldFocus) + oldFocus.focusGroupFocused(false); + } if (newFocus is null || isChild(newFocus)) { if (newFocus !is null) { // when calling, setState(focused), window.focusedWidget is still previously focused widget @@ -631,6 +634,8 @@ class Window : CustomEventTarget { newFocus.setState(targetState); } _focusedWidget = newFocus; + if (_focusedWidget) + _focusedWidget.focusGroupFocused(true); // after focus change, ask for actions update automatically //requestActionsUpdate(); } diff --git a/src/dlangui/widgets/docks.d b/src/dlangui/widgets/docks.d index 9fb8a83d..5ddedcdb 100644 --- a/src/dlangui/widgets/docks.d +++ b/src/dlangui/widgets/docks.d @@ -321,6 +321,7 @@ class DockWindow : WindowFrame { this(string ID) { super(ID); + focusGroup = true; } override protected void initialize() { diff --git a/src/dlangui/widgets/tabs.d b/src/dlangui/widgets/tabs.d index a1576f0c..6dba34c9 100644 --- a/src/dlangui/widgets/tabs.d +++ b/src/dlangui/widgets/tabs.d @@ -120,6 +120,7 @@ class TabItemWidget : HorizontalLayout { setItem(item); clickable = true; trackHover = true; + _label.trackHover = true; } void setStyles(string tabButtonStyle, string tabButtonTextStyle) { styleId = tabButtonStyle; @@ -814,9 +815,10 @@ class TabWidget : VerticalLayout, TabHandler, TabCloseHandler { } /// change style ids - void setStyles(string tabWidgetStyle, string tabStyle, string tabButtonStyle, string tabButtonTextStyle) { + void setStyles(string tabWidgetStyle, string tabStyle, string tabButtonStyle, string tabButtonTextStyle, string tabHostStyle = null) { styleId = tabWidgetStyle; _tabControl.setStyles(tabStyle, tabButtonStyle, tabButtonTextStyle); + _tabHost.styleId = tabHostStyle; } private bool _tabNavigationInProgress; diff --git a/src/dlangui/widgets/widget.d b/src/dlangui/widgets/widget.d index ff1b893a..3021c6e6 100644 --- a/src/dlangui/widgets/widget.d +++ b/src/dlangui/widgets/widget.d @@ -282,7 +282,9 @@ public: @property uint state() const { if ((_state & State.Parent) != 0 && _parent !is null) return _parent.state; - return _state | State.WindowFocused; // TODO: + if (focusGroupFocused) + return _state | State.WindowFocused; // TODO: + return _state; } /// override to handle focus changes protected void handleFocusChange(bool focused, bool receivedFocusFromKeyboard = false) { @@ -296,6 +298,8 @@ public: } /// set new widget state (set of flags from State enum) @property Widget state(uint newState) { + if ((_state & State.Parent) != 0 && _parent !is null) + return _parent.state(newState); if (newState != _state) { uint oldState = _state; _state = newState; @@ -791,10 +795,41 @@ public: @property bool focusGroup() { return _focusGroup; } /// set focus group flag for container widget @property Widget focusGroup(bool flg) { _focusGroup = flg; return this; } + @property bool focusGroupFocused() const { + Widget w = focusGroupWidget(); + return (w._state & State.WindowFocused) != 0; + } + protected bool setWindowFocusedFlag(bool flg) { + if (flg) { + if ((_state & State.WindowFocused) == 0) { + _state |= State.WindowFocused; + invalidate(); + return true; + } + } else { + if ((_state & State.WindowFocused) != 0) { + _state &= ~State.WindowFocused; + invalidate(); + return true; + } + } + return false; + } + @property Widget focusGroupFocused(bool flg) { + Widget w = focusGroupWidget(); + w.setWindowFocusedFlag(flg); + while (w.parent) { + w = w.parent; + if (w.parent is null || w.focusGroup) { + w.setWindowFocusedFlag(flg); + } + } + return this; + } /// find nearest parent of this widget with focusGroup flag, returns topmost parent if no focusGroup flag set to any of parents. - Widget focusGroupWidget() { - Widget p = this; + Widget focusGroupWidget() inout { + Widget p = cast(Widget)this; while (p) { if (!p.parent || p.focusGroup) break; @@ -1694,6 +1729,11 @@ class WidgetGroup : Widget { _children.clear(destroyObj); } + /// replace child with other child + void replaceChild(Widget newChild, Widget oldChild) { + _children.replace(newChild, oldChild); + } + } /** WidgetGroup with default drawing of children (just draw all children) */ diff --git a/src/dlangui/widgets/winframe.d b/src/dlangui/widgets/winframe.d index f322449c..dd656ad5 100644 --- a/src/dlangui/widgets/winframe.d +++ b/src/dlangui/widgets/winframe.d @@ -27,7 +27,7 @@ class WindowFrame : VerticalLayout { protected Widget _bodyWidget; @property Widget bodyWidget() { return _bodyWidget; } @property void bodyWidget(Widget widget) { - _children.replace(widget, _bodyWidget); + _bodyLayout.replaceChild(widget, _bodyWidget); _bodyWidget = widget; _bodyWidget.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); _bodyWidget.parent = this; @@ -38,6 +38,7 @@ class WindowFrame : VerticalLayout { protected TextWidget _caption; protected ImageButton _closeButton; protected bool _showCloseButton; + protected HorizontalLayout _bodyLayout; @property TextWidget caption() { return _caption; } @@ -76,11 +77,16 @@ class WindowFrame : VerticalLayout { _captionLayout.addChild(_caption); _captionLayout.addChild(_closeButton); + _bodyLayout = new HorizontalLayout(); + _bodyLayout.styleId = STYLE_DOCK_WINDOW_BODY; + _bodyWidget = createBodyWidget(); - _bodyWidget.styleId = STYLE_DOCK_WINDOW_BODY; + _bodyLayout.addChild(_bodyWidget); + _bodyWidget.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); + //_bodyWidget.styleId = STYLE_DOCK_WINDOW_BODY; addChild(_captionLayout); - addChild(_bodyWidget); + addChild(_bodyLayout); } protected Widget createBodyWidget() { diff --git a/views/res/dock_window_background.xml b/views/res/dock_window_background.xml new file mode 100644 index 00000000..f4972e45 --- /dev/null +++ b/views/res/dock_window_background.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/views/res/dock_window_background_focused.9.png b/views/res/dock_window_background_focused.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9e4181bc36683426d6280d7945266480d32dd949 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^fjv^J2#jV zF>5CK9~R80*D`Wbxj4~if0EdTyN z(NE7xW@PC9t;?95JhS=WPlicv+9yU|;a8r^zma*LVl<<-07KYDUYVG3{PbP|s za=qY>Z1>;{m?rrj-*)*N}DH*t!1Qlf}c TP~kyKke@tV{an^LB{Ts5d2MNb literal 0 HcmV?d00001 diff --git a/views/res/dock_window_background_normal.9.png b/views/res/dock_window_background_normal.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0311ac08d08626930c187a0840d47b816241f57b GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^fUnfx)>b zHL)Z$MWH;iBtya7(>EYRFO?lA-r?!u7-Dhy?UdcT4F)_e=fk9KFmTttwPlKp(;n@xK%&Q0PHVz|+#T@kUY@!#FLdyE-#-L3R5u9su|ZJ^8gBqnRo zf2|2p;%9{z6i%i!aBSJuJ3~bFi}NFamycA;B2=qB|N7^-R$6*}{O?EH3=Ddr0lTKW fIh8$6e$pof_cr5Y>sDGxf*kAV>gTe~DWM4fc)ebS literal 0 HcmV?d00001 diff --git a/views/res/dock_window_caption_background.xml b/views/res/dock_window_caption_background.xml new file mode 100644 index 00000000..683dd8b4 --- /dev/null +++ b/views/res/dock_window_caption_background.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/views/res/dock_window_caption_background_down.xml b/views/res/dock_window_caption_background_down.xml new file mode 100644 index 00000000..39355aac --- /dev/null +++ b/views/res/dock_window_caption_background_down.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/views/res/dock_window_caption_background_focused.9.png b/views/res/dock_window_caption_background_focused.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cb94b3f1b2c8c74255fee62dccc710c429b7911d GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^flT9}PnPcZw^@PvglCaa&i(3XjX>ZS<@(fKtXXoSx8oSehP YFk4w$Z&&p%ACNmeUHx3vIVCg!0Ell}x&QzG literal 0 HcmV?d00001 diff --git a/views/res/dock_window_caption_background_focused_down.9.png b/views/res/dock_window_caption_background_focused_down.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ec5df1421b5cadaf6a221e8d6ceddaf75723fd7c GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^fFdh=fK`%Pn)k`(x<;UoY-UJAiF1B#Zfaf$kjuc}T$Gwv zlA5AWo>`Ki;O^-gkfN8$4it~|ba4#PIG>zyfd8NJM#)0WChwfv#n0@SI}e;b+A^`R z@u5Apk3*DeYh%oTmS-uOcoP@2DfWaEckXLq@N83Dy?j==ghwgwE~`1S^z43om_H#+ jhjUWShxrq^mKicJ%<Mol60OSHsS3j3^P6BYipCq^Fdh=fK`%PTG=AC*bgWqn;8;O;+&tGo0?Yw6PQeO81AVsy_0Nt>p}tE) zK5FwH-zaO?UcXss62rOIX5ALw-Ue@g~xz}n4wTHF|Kt=X_;vU&Wr{#zC)cfaf@ k$o%r@L5KFG2-d7B22)NUxj##ke}G)z>FVdQ&MBb@0L?K^-~a#s literal 0 HcmV?d00001 diff --git a/views/res/main_menu_background.9.png b/views/res/main_menu_background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..13a25e840d066f9cfdb4f8b8921337d56c8c35ec GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^U^WLEkTt>lKP!-8OY(MiVfYV%3-&Ib3>4uk@Q5sC zVBi)8VMc~ob0mO*>?NMQuIvw3CE0itw(77H0EJ{TLn2C?^K)}k^GbkR1_tM%)Wnk1 z6ovB4k_-iRPv3wPy;OFfc(SL9V~EE2wHJ4CH8}9NUX&L8|Nr%t?Hfe}+Zm^CEYJ>7 zYvrG$)_&b($K;CsnC!S~`Ya8Zifl^~=bTWHbm%DNOJazXuMG&T-5^jC;8L@}EvHe7WuO^?u8|oNF`Xo?Zy8_5r!W)78&qol`;+0G`)To&W#< literal 0 HcmV?d00001 diff --git a/views/res/mdpi/tab_btn_dark_down_focused.9.png b/views/res/mdpi/tab_btn_dark_down_focused.9.png index 0ea1b0f95f5597da05f3db74e46242d0ac6d1448..0e8e0b5ec0eda3b3a02c9ff88542382351034d73 100644 GIT binary patch delta 179 zcmX@ic#Ki8Gr-TCmrII^fq{Y7)59eQNDBfn9|s$dJo)zfmWhh8^}-Ac+`^0uv*t(u z1=&kHeO=ifuu5`sXom;xdIuDe%?ybsan8@pP0cF-av2z$i&7IyQd1PlGfOfQ+&z5* zQuI>Uf#O=8E{-7@=aW+o@c&cZC@Go2`!9Ia{7$KL5@~G#s!48#TihBZp2=xg#LsY; Xla;SM??gXP7bk?NMQuI%@jxp=Mlt`whd0ty9qx;TbdoK80Rd^$Y=2rRZ{KB{LEYM2>sr_2ll%4Zmg z7?rP>Y%-aD%jBay_msc$W5f*t7fGfu9A3e=m@OcSLC1LFY$?ga%EpOz-taK|Tq^jZ UC+9Lh&};@zS2jPFbxsLQ0Px~B5C8xG diff --git a/views/res/mdpi/tab_btn_dark_down_focused_hover.9.png b/views/res/mdpi/tab_btn_dark_down_focused_hover.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f2bb072a34e567bba0ac612e63ac643431b01675 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^fl_G86PZ!4!jq}MV2l)RfZeNVu`>`I&k)qsHmo zoXXs1%>2`nC-L6c_g#mXnfY+N8k<%_Vg`pY^VS2~Y}5ZuW|}aGwKS<+=lTNGbN_p8 z@En@@V?k&4!P7@uCN|Fa)1a%pAp2N4hv82SS9u28fRgQ8mfa~JCwaR1xvXERLtqy>SPkAn?Jo_za#%S1)ldSM0zZed1-S#uW8Q|y6%O%Cdz`(%k>ERLtqy<2jgAGW^fBv61QBk(8lYxP|lhOR->9s&X z_7YEDSN8kNT)ft%sTFF=fI^<0E{-7WD!BxLPu^5a z2(4yZVA$P!C5~wVW9FC3n?B9Bx>qCiLf$F14-EVT+#7seN~elXdG&`;O;haTpE9-s QKtmZkUHx3vIVCg!0C!L}`Tzg` diff --git a/views/res/mdpi/tab_btn_dark_down_hover.9.png b/views/res/mdpi/tab_btn_dark_down_hover.9.png index 65a3dbac477a144cbf96532ed36669f9a1210063..da9eb2f4f65a1da71c956158e2564026f55a6b6b 100644 GIT binary patch delta 425 zcmV;a0apIQ0lNbsiBL{Q4GJ0x0000DNk~Le0000H0000E2nGNE0Lkt5w2>hle-i)z z3ljkVnw%H_000McNliru-~|~A3K^}iiR=IX03B&mSad^gZEa<4bN~PV002XBWnpw> zWFU8GbZ8()Nlj2>E@cM*00AFKL_t(2&yAAJOT$1A#oyaZy;zz=n%?!KMK7ZG{~tvw zg-R6#KQD^fmiTeZc*yRWP1>4;e~_8Y+uyv&EU|uRCFUv-0bnw{)BU||FFHM+E)|~~ z4TJph>Ru0qJCtg*ho=|3y)R&lLDo+ikh6-|02dd`7df(ij5aIl#~4p;AtE8f7z1Mr+ODeBLz1|Qq9|HJlDLcffAhyf2tY-m z+R*fG$XpL}PS_E#dbP(1+Nhb+aZ3Z9W}UD)bJnigihU31h(PI_E6SvND>Uqg%iBRD z5lDppL93PRX44%#WJ3f>^%`1R3Ja)JXT6=Iw~74g8vwAC_VmB;&gMDYIRN+tEh$w_ T?=91s00000NkvXXu0mjf4;8a- delta 176 zcmdnZe3((OGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qM~elCj$d_C!_hv(`$i( z>?NMQuI%@jx%e1V-K^6W1BC)ST^vI!PA8juKAoNb1QuH}AJwx7HO!2+Q)UJNMX8A;sVNHOnI#zt?w-B@ zDSD~wKyfWk7sn8d^T{a(`2Q(yl$6Zi{TIAyey7wriL|x=)g-sWEp81H&*U^L;%7L_ X$;#KBccLGti<80A)z4*}Q$iB}6^b!F delta 176 zcmX@cc$iVKGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qM~elCj$d_C!_hv(`$i( z>?NMQuI%@jx%e0bI44g!2owtNba4!^IGt?r`E+^$5Lj%@d{oaS)G#yNPMH}9l+Q2} zF)Cj%*<>>RmdQtZ?kRug$A}vQE|N@RIJ|;!Fzopr0FbaYFaQ7m diff --git a/views/res/mdpi/tab_btn_dark_down_selected.9.png b/views/res/mdpi/tab_btn_dark_down_selected.9.png index d5ae72ecb2b2090f696e613873fb414415da60a7..9b2fa1542bbee7dd5a5791fa7a74dd6fe97e38a3 100644 GIT binary patch delta 415 zcmV;Q0bu^Z0kH!iiBL{Q4GJ0x0000DNk~Le0000H0000E2nGNE0Lkt5w2>hle-i)z z3ljkVnw%H_000McNliru-~|~A3k|MuY|sDz03B&mSad^gZEa<4bN~PV002XBWnpw> zWFU8GbZ8()Nlj2>E@cM*009+AL_t(2&y|xgO9Md=g}=Aiq!NvwHezETs3?di{{Kp_ zPAygzNs)sTx!KE&MfS{vyF~L~e_&>J=DpovM(l^TeC7m za;V)IjfRSVn&sH;!vbi z0T2MjCr8YS1tElg+q_utaCfa=lB>%L)pgCG)*v*_>G+uGtiYW=Z8|G>dc0BZD1Ux^ z`*b!3;QVad=|OY%`h43rHrsgrnDk8tZ!h=SxjTE7Ztu=D_yON)sW=G&9QptN002ov JPDHLkV1h@BtfK$` delta 175 zcmdnUe27u8Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93qM~elCj$d_C!_hv(`$i( z>?NMQuI%@jx%e0jjQ(!o1Pb|kx;TbdoPIlbqacGK&*3Nb*OJ-Q7A6RlB^Xn~%L0}i7Z*l8HLadf+`jw4ZcX(D_KJpRhf`1L7GGlBX_f!< Yu+W+xk2`_ZGB9|$`mwsKb4q9e0Q90hN&o-= diff --git a/views/res/mdpi/tab_btn_dark_up_focused.9.png b/views/res/mdpi/tab_btn_dark_up_focused.9.png index 74c57673202d8e78150cdd242bbec8a22521e7cc..95d260aaa171d8f21ce15cb8ac3d8ece5b64131f 100644 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^fUnfx)>b zHL)Z$MWH;iBtya7(>EYRFO?lA-skD!7@~3h?qoy0Lk2vq^R>lxF!F4eK2h1A@ZqK@ z(o-hBi!5qcGykN9(uJl&N2V)9-v4;{dqQ&5sjTYnCmEc4TpyeDwQkS9edu;>m`+jh z?zp0TF^m?n{6`zU#~tJ_RP0>gTe~DWM4fK&EMG literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`Qt@n9=;?>9s&X_7YEDSN8ji0)mFp!jiQ)K%pQ{7sn8b({Cql zU`(Vwka5n$atl>4I3xA$gSpdt9ej wTJg8X92DK*px$)deD0aqo9us>d)%*N+|?}btNOPnC(v{TPgg&ebxsLQ0GGi(9smFU diff --git a/views/res/mdpi/tab_btn_dark_up_focused_hover.9.png b/views/res/mdpi/tab_btn_dark_up_focused_hover.9.png new file mode 100644 index 0000000000000000000000000000000000000000..65cba338fe7e1af68ff7751b5d02aff1db78eed5 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^fl_G7;o-U3d8t3m$w&iO!;Ax#N=w01xbYX6vEmN?*jMxsw zp49V`lv8STBwSnePxJe`>_nfPt@pMBX}0{x-zp3VbNi*kx()Kq1-8kcblJ{M_8syb>Unfx)>b zHL)Z$MWH;iBtya7(>EYRFO?lA-s|b&7@~3h?qoy0Lk2vq^R>lxF!H48E4wE=I`sC^ zy#+lb=O-zr{Pl4RWL~P_v*+ZdwaechJZ9vTRlPlh;aq!8!F;u|)ytQibUA*w&-d1f z@6o#+sx`cRI;ZpTo2fj{nI~oZ4$KDPbL|z4^CoR=+Q|_hdS2t%ZIR4bGhCJ`YSkT( k_gZry@!P|fV)c5T7zopr0Qlo<>;M1& literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`Qt@n9=;?>9s&X_7YEDSN8ji0)k4ao2M&=0)>1%T^vI!PQRVJ zk@tXt0Q334tZ6BF(^43hKUAIaZvM2_wMB`iiy0PN^JO}($e`<}wMUV$PwZvMYa5v& r)^Gu)xg7T*QVsJ%>p$cN?EB3A?1$*-CTqqlpur5Du6{1-oD!M<_isJ~ diff --git a/views/res/mdpi/tab_btn_dark_up_hover.9.png b/views/res/mdpi/tab_btn_dark_up_hover.9.png index c4ac1a8becda6c37e4d9d6d2559ef46215245cff..eb81d9ed8470a5421a7aec8fb57820e7a5d00a05 100644 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^flS|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}I|BnFzo(01h{pNeNxuGv4S3q*mp5`>j#}`So1@UFrsIFT z%cBMsDR#aZuEuK{w@F=}pqDPM>7#LauU~p}O(4G0q<%(D&GyEM-9jIyYF}M6OEmYs2irQ~8w`TC-Y+;i zId;QxtJkW(uPs`%)h#Bni#cbGUiO5DhKwqOqp$cI79U>OxAl8@WXE~tAMDpTW1gEo RSe66|Gf!7Pmvv4FO#sdesBZuO literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`Qt@n9=;?>9s&X_7YEDSN8ji0)mFT&(EH)1quaux;TbdoPIlb zBQJv@5A*r;^E(YAS|cM`4I{KnT&ilPUntt^ua`6R7Q>9i(u`iYOc%sj4#}$=*yB3I x(u%)5=Ah^f2lb}w=5x=?-emv7+~a;FUnfx)>b zHL)Z$MWH;iBtya7(>EYRFO?lA-skD!7@~3h?qoy0Lk2vq^R>lxF!F4eK2h1A@ZqK@ z(o-hBi!5qcGykN9(uJl&N2V)9-v4;{dqQ&5sjTYnCmEc4TpyeDwQkS9edu;>m`+jh z?zp0TF^m?n{6`zU#~tJ_RP0>gTe~DWM4f9s&X_7YEDSN8ji0)htm+S_)_015?px;TbdoPIlb zBQJv@5A*r;^E(YAS|cM`4I{KnT&ilPUntt^ua`6R7Q>9i(u`iYOc%sj4#}$=*yB3I x(u%)5=Ah^f2lb}w=5x=?-emv7+~a;FWFU8GbZ8()Nlj2>E@cM*00AvYL_t(2&yAAHPQx$| zMb9|43u;9QB)@#(TPIB82eQWVd4a&pJl!vCSs zTGllQfU4Gt*EjdNs`={TWC*FlAHp z2V>4pk0e0UlpDj*ggi?TVdIl$DZSgr#mE-m{i9H048|C?jkwnWjK)87(+;!QY->n2 z?Qr+-q$Nb1vsjxnOw-EbHRd{JD<$4LoVB4}!{>s8)p9;}WT)jSNGnnz@ePy4b!*hU zk0GTJDU~bpWd2sPK2bgS;GpF=UOd$WLu_fD-zP|-z?1X)S|G!9o3 zlEeUr1t^N4wA;G?9PIDuCVRh!69Je`e*yRdk^yES)G73C00000NkvXXu0mjf%&EH+ literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*x37`Qt@n9=;?>9s&X_7YEDSN8ji0)mE&@2XqGfI@+uE{-7R$i-FVdQ&MBb@09oBa?f?J) diff --git a/views/res/mdpi/toolbar_background.9.png b/views/res/mdpi/toolbar_background.9.png index c348ca45899fd20d85c0ab0de97612452b3e7201..8612803aa1e1b9780d0c75b65ec953c78929697f 100644 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^+(0bB!3HFC-mwb21s-)EHLGLZhYuDl;8)amKs7~*mK?X-!-8NpFcLKpS}LkECudK+ZlW>umI6EhksTFBWKF> smdP*9XPPwMZ(XiVx8C;s*SA0Ay*E+kXPTVeW{~SWUHx3vIVCg!04*wArvLx| diff --git a/views/res/mdpi/toolbar_host_background.9.png b/views/res/mdpi/toolbar_host_background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8f6725e19ec28d4672056ff60662335ce61e6414 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^96&71!3HE9eb4O!Qfx`y?k)^(7~V7ddc9HB4k*G| z;1OBOz`!jG!i)^F=12eq*-JcqUD+S7O0pS-fq?mdKI;Vst01L-wIRF3v literal 0 HcmV?d00001 diff --git a/views/res/tab_btn_dark_down.xml b/views/res/tab_btn_dark_down.xml index 666103a6..2ed91e0e 100644 --- a/views/res/tab_btn_dark_down.xml +++ b/views/res/tab_btn_dark_down.xml @@ -3,6 +3,9 @@ + diff --git a/views/res/tab_btn_dark_up.xml b/views/res/tab_btn_dark_up.xml index b00959da..2945ff6a 100644 --- a/views/res/tab_btn_dark_up.xml +++ b/views/res/tab_btn_dark_up.xml @@ -3,6 +3,9 @@ + diff --git a/views/res/theme_default.xml b/views/res/theme_default.xml index dd553d4d..c266e32d 100644 --- a/views/res/theme_default.xml +++ b/views/res/theme_default.xml @@ -164,7 +164,7 @@ @@ -173,24 +173,21 @@ backgroundImageId="tab_btn_dark_down" />