forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update styles for treem, list items, menu items

This commit is contained in:
Vadim Lopatin 2015-01-21 12:17:06 +03:00
parent 98b99f1d7d
commit 9bcff67702
6 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/list_item_background.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="#C0000000,1px"
android:drawable="btn_disabled"
android:state_enabled="false"
android:state_focused="true" />
<item
android:drawable="#80000000,1px,#E04040FF"
android:drawable="btn_pressed"
android:state_focused="true" />
<item
android:drawable="#A00000FF"
android:drawable="btn_normal"
android:state_selected="true" />
<item
android:drawable="#E04040FF"

18
res/list_item_background_solid.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:drawable="#C0000000,1px"
android:state_enabled="false"
android:state_focused="true" />
<item
android:drawable="#80000000,1px,#E04040FF"
android:state_focused="true" />
<item
android:drawable="#A00000FF"
android:state_selected="true" />
<item
android:drawable="#E04040FF"
android:state_hovered="true" />
<item
android:drawable="@null" />
</selector>

18
res/menu_item_background.xml Normal file
View File

@ -0,0 +1,18 @@
<?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"
android:state_focused="true" />
<item
android:drawable="btn_pressed"
android:state_focused="true" />
<item
android:drawable="btn_normal"
android:state_selected="true" />
<item
android:drawable="#E04040FF"
android:state_hovered="true" />
<item
android:drawable="@null" />
</selector>

15
res/theme_default.xml
View File

@ -159,12 +159,9 @@
textFlags="Parent"
/>
<style id="MENU_ITEM"
backgroundImageId="menu_item_background"
padding="4,2,4,2"
>
<state state_focused="true" backgroundColor="#40C0C000"/>
<state state_pressed="true" backgroundColor="#4080C000"/>
<state state_selected="true" backgroundColor="#00F8F9Fa"/>
<state state_hovered="true" backgroundColor="#C0FFFF00"/>
</style>
<style id="MENU_ICON"
margins="2,2,2,2"
@ -314,16 +311,18 @@
fontFace="Arial"
fontFamily="SansSerif"
fontSize="16">
<state state_focused="true" backgroundColor="#40C0C000"/>
<state state_pressed="true" backgroundColor="#4080C000"/>
<state state_selected="true" backgroundColor="#00F8F9Fa"/>
<state state_hovered="true" backgroundColor="#C0FFFF00"/>
</style>
<style id="TREE_ITEM_EXPAND_ICON"
margins="2,0,2,0"
align="Left|VCenter"
textFlags="Parent"
/>
<style id="TREE_ITEM_BODY"
margins="2,0,2,0"
align="Left|VCenter"
textFlags="Parent"
backgroundImageId="list_item_background"
/>
<style id="TREE_ITEM_ICON"
margins="2,0,2,0"
align="Left|VCenter"

3
src/dlangui/widgets/styles.d
View File

@ -102,8 +102,11 @@ immutable string STYLE_EDIT_LINE = "EDIT_LINE";
immutable string STYLE_EDIT_BOX = "EDIT_BOX";
/// standard style id for background similar to transparent button
immutable string STYLE_TRANSPARENT_BUTTON_BACKGROUND = "TRANSPARENT_BUTTON_BACKGROUND";
/// standard style id for tree item
immutable string STYLE_TREE_ITEM = "TREE_ITEM";
/// standard style id for tree item body (icon + label)
immutable string STYLE_TREE_ITEM_BODY = "TREE_ITEM_BODY";
/// standard style id for tree item label
immutable string STYLE_TREE_ITEM_LABEL = "TREE_ITEM_LABEL";
/// standard style id for tree item icon

10
src/dlangui/widgets/tree.d
View File

@ -470,6 +470,7 @@ class TreeItemWidget : HorizontalLayout {
ImageWidget _expander;
ImageWidget _icon;
TextWidget _label;
HorizontalLayout _body;
long lastClickTime;
@property TreeItem item() { return _item; }
@ -519,21 +520,24 @@ class TreeItemWidget : HorizontalLayout {
lastClickTime = ts;
return true;
};
_body = new HorizontalLayout("item_body");
_body.styleId = STYLE_TREE_ITEM_BODY;
_body.setState(State.Parent);
if (_item.iconRes.length > 0) {
_icon = new ImageWidget("icon", _item.iconRes);
_icon.styleId = STYLE_TREE_ITEM_ICON;
_icon.setState(State.Parent);
_body.addChild(_icon);
}
_label = new TextWidget("label", _item.text);
_label.styleId = STYLE_TREE_ITEM_LABEL;
_label.setState(State.Parent);
_body.addChild(_label);
// append children
addChild(_tab);
if (_expander)
addChild(_expander);
if (_icon)
addChild(_icon);
addChild(_label);
addChild(_body);
}
override bool onKeyEvent(KeyEvent event) {