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

dark theme related fixes

This commit is contained in:
Vadim Lopatin 2015-03-06 14:56:24 +03:00
parent a050465e9f
commit 63e9d69b5c
26 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,8 +305,7 @@ class UrlImageTextButton : ImageTextButton {
//_icon.styleId = STYLE_BUTTON_IMAGE;
//_label.styleId = STYLE_BUTTON_LABEL;
//_label.textFlags(TextFlag.Underline);
_label.ownStyle.getOrCreateState(State.Hovered, State.Hovered).textFlags(TextFlag.Underline);
_label.textColor(0x000080);
_label.styleId = "BUTTON_LABEL_LINK";
padding(Rect(3,3,3,3));
}
}

20
src/dlangui/widgets/grid.d
View File

@ -1251,7 +1251,7 @@ class StringGridWidget : StringGridWidgetBase {
Point sz = fnt.textSize(txt);
Align ha = Align.Left;
applyAlign(rc, sz, ha, Align.VCenter);
fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000);
fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor);
}
/// draw cell content
@ -1272,7 +1272,7 @@ class StringGridWidget : StringGridWidgetBase {
if (row < 0)
ha = Align.HCenter;
applyAlign(rc, sz, ha, Align.VCenter);
fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000);
fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor);
}
/// draw cell background
@ -1288,7 +1288,7 @@ class StringGridWidget : StringGridWidgetBase {
if (_rowSelect && selectedRow)
selectedCell = true;
// draw header cell background
uint cl = 0x80909090;
uint cl = 0xC0909090;
if (c >= _headerCols || r >= _headerRows) {
if (c < _headerCols && selectedRow)
cl = 0x80FFC040;
@ -1296,8 +1296,8 @@ class StringGridWidget : StringGridWidgetBase {
cl = 0x80FFC040;
}
buf.fillRect(rc, cl);
buf.fillRect(vborder, 0x80202020);
buf.fillRect(hborder, 0x80202020);
buf.fillRect(vborder, 0xC0202020);
buf.fillRect(hborder, 0xC0202020);
}
/// draw cell background
@ -1315,15 +1315,15 @@ class StringGridWidget : StringGridWidgetBase {
// normal cell background
if (c < _fixedCols || r < _fixedRows) {
// fixed cell background
buf.fillRect(rc, 0x80E0E0E0);
buf.fillRect(rc, 0xC0E0E0E0);
}
buf.fillRect(vborder, 0x80C0C0C0);
buf.fillRect(hborder, 0x80C0C0C0);
buf.fillRect(vborder, 0xC0C0C0C0);
buf.fillRect(hborder, 0xC0C0C0C0);
if (selectedCell) {
if (_rowSelect)
buf.drawFrame(rc, 0x80A0B0FF, Rect(0,1,0,1), 0xC0FFFF00);
buf.drawFrame(rc, 0xC0A0B0FF, Rect(0,1,0,1), 0xE0FFFF40);
else
buf.drawFrame(rc, 0x404040FF, Rect(1,1,1,1), 0xC0FFFF00);
buf.drawFrame(rc, 0x804040FF, Rect(1,1,1,1), 0xE0FFFF40);
}
}

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

@ -377,10 +377,10 @@ class Style {
}
/// get custom color attribute
uint customColor(string id) {
uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const {
if (id in _customColors)
return _customColors[id];
return parentStyle.customColor(id);
return parentStyle.customColor(id, defColor);
}
/// sets custom color attribute for style
@ -883,10 +883,10 @@ class Theme : Style {
}
/// get custom color attribute - transparent by default
override uint customColor(string id) {
override uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const {
if (id in _customColors)
return _customColors[id];
return COLOR_TRANSPARENT;
return defColor;
}
/// returns colors to draw focus rectangle or null if no focus rect should be drawn for style

14
views/res/combobox_background_dark.xml
View File

@ -1,18 +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" />
android:drawable="@drawable/btn_pressed_dark" />
<item android:state_focused="true" android:state_default="true" android:state_enabled="true"
android:drawable="@drawable/btn_default" />
android:drawable="@drawable/btn_default_dark" />
<item android:state_focused="true" android:state_enabled="true"
android:drawable="@drawable/btn_default" />
android:drawable="@drawable/btn_default_dark" />
<item android:state_enabled="true" android:state_default="true"
android:drawable="@drawable/btn_default" />
android:drawable="@drawable/btn_default_dark" />
<item android:state_enabled="true" android:state_hovered="true"
android:drawable="@drawable/btn_hover" />
android:drawable="@drawable/btn_hover_dark" />
<item android:state_enabled="true"
android:drawable="@drawable/btn_normal" />
android:drawable="@drawable/btn_normal_dark" />
<item
android:drawable="@drawable/btn_disabled" />
android:drawable="@drawable/btn_disabled_dark" />
</selector>

8
views/res/editbox_background_dark.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true" android:state_enabled="false" android:drawable="editbox_background_disabled_focus" />
<item android:state_focused="true" android:drawable="editbox_background_focus" />
<item android:state_enabled="false" android:drawable="editbox_background_disabled" />
<item android:drawable="editbox_background_normal" />
<item android:state_focused="true" android:state_enabled="false" android:drawable="editbox_background_disabled_focus_dark" />
<item android:state_focused="true" android:drawable="editbox_background_focus_dark" />
<item android:state_enabled="false" android:drawable="editbox_background_disabled_dark" />
<item android:drawable="editbox_background_normal_dark" />
</selector>

BIN
views/res/mdpi/editbox_background_disabled_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 221 B

BIN
views/res/mdpi/editbox_background_disabled_focus_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 241 B

BIN
views/res/mdpi/editbox_background_focus_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 259 B

After

Width:  |  Height:  |  Size: 242 B

BIN
views/res/mdpi/editbox_background_normal_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 220 B

BIN
views/res/mdpi/popup_window_background_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 490 B

BIN
views/res/mdpi/tab_btn_dark_up_focused_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 213 B

BIN
views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 204 B

BIN
views/res/mdpi/tab_btn_dark_up_hover_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 213 B

BIN
views/res/mdpi/tab_btn_dark_up_normal_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 213 B

BIN
views/res/mdpi/tab_btn_dark_up_selected_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 209 B

After

Width:  |  Height:  |  Size: 212 B

BIN
views/res/mdpi/tab_up_background_dark_focused_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 198 B

BIN
views/res/mdpi/toolbar_background_3d_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 255 B

BIN
views/res/mdpi/toolbar_background_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 250 B

BIN
views/res/mdpi/toolbar_control_disabled_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 257 B

BIN
views/res/mdpi/toolbar_control_normal_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 257 B

BIN
views/res/popup_menu_background_normal_dark.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 383 B

10
views/res/tab_btn_dark_up_dark.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="tab_btn_dark_up_focused_selected"
android:drawable="tab_btn_dark_up_focused_selected_dark"
android:state_selected="true" android:state_window_focused="true" />
<item
android:drawable="tab_btn_dark_up_focused"
android:drawable="tab_btn_dark_up_focused_dark"
android:state_window_focused="true" />
<item
android:drawable="tab_btn_dark_up_selected"
android:drawable="tab_btn_dark_up_selected_dark"
android:state_selected="true" />
<item
android:drawable="tab_btn_dark_up_hover"
android:drawable="tab_btn_dark_up_hover_dark"
android:state_hovered="true" />
<item
android:drawable="tab_btn_dark_up_normal" />
android:drawable="tab_btn_dark_up_normal_dark" />
</selector>

4
views/res/tab_up_background_theme_dark.xml
View File

@ -1,8 +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_focused_dark"
android:drawable="tab_up_background_dark_focused_dark"
android:state_window_focused="true" />
<item
android:drawable="tab_up_background_normal_dark" />
android:drawable="tab_up_background_dark_normal_dark" />
</selector>

25
views/res/theme_dark.xml
View File

@ -7,6 +7,8 @@
>
<color id="window_background" value="#000000"/>
<color id="dialog_background" value="#222222"/>
<color id="edit_background" value="#070808"/>
<style id="BUTTON"
backgroundImageId="btn_background_dark"
align="Center"
@ -30,6 +32,12 @@
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="true" state_hovered="true" textColor="#FF0000"/>
</style>
<style id="BUTTON_LABEL_LINK" parent="BUTTON_LABEL"
textColor="#2020FF"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="true" state_hovered="true" textColor="#E0E0FF" textFlags="Underline"/>
</style>
<style id="BUTTON_IMAGE"
margins="2,2,2,2"
align="Center"
@ -84,14 +92,11 @@
backgroundImageId="btn_background_dark"
align="Center"
/>
<color id="sample_color_rgb" value="#8CF"/>
<color id="sample_color_argb" value="#48CF"/>
<color id="sample_color_rrggbb" value="#80C0F0"/>
<color id="sample_color_aarrggbb" value="#4080C0F0"/>
<drawable id="btn_check" value="btn_check_dark"/>
<drawable id="btn_radio" value="btn_radio_dark"/>
<drawable id="arrow_right_down_black" value="arrow_right_down_black_dark"/>
<drawable id="arrow_right_hollow" value="arrow_right_hollow_dark"/>
<drawable id="toolbar_separator" value="toolbar_separator_dark"/>
<drawable id="scrollbar_button_up" value="scrollbar_btn_up"/>
<drawable id="scrollbar_button_down" value="scrollbar_btn_down"/>
@ -122,7 +127,7 @@
</style>
<style id="TAB_UP_DARK"
backgroundImageId="tab_up_background_dark"
backgroundImageId="tab_up_background_theme_dark"
layoutWidth="FILL_PARENT"
>
</style>
@ -196,20 +201,20 @@
align="Left|VCenter"
textFlags="UnderlineHotKeys"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="false" textColor="#FFFFFF"/>
</style>
<style id="MAIN_MENU_LABEL"
margins="4,2,4,2"
align="Left|VCenter"
textFlags="Parent"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="false" textColor="#FFFFFF"/>
</style>
<style id="MENU_ACCEL"
margins="4,2,4,2"
align="Left|VCenter"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="false" textColor="#FFFFFF"/>
</style>
<style id="TRANSPARENT_BUTTON_BACKGROUND"
backgroundImageId="btn_background_transparent_dark"
@ -263,7 +268,7 @@
layoutWeight="0"
/>
<style id="DOCK_HOST"
backgroundColor="#293955"
backgroundColor="#192935"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
padding="2,2,2,2"
@ -363,7 +368,7 @@
<style id="TREE_ITEM_BODY"
align="Left|VCenter"
textFlags="Parent"
backgroundImageId="list_item_background"
backgroundImageId="list_item_background_dark"
/>
<style id="TREE_ITEM_ICON"
align="Left|VCenter"

10
views/res/theme_default.xml
View File

@ -6,6 +6,8 @@
>
<color id="window_background" value="#FFFFFF"/>
<color id="dialog_background" value="#EEEEEE"/>
<color id="edit_background" value="#FFFFFF"/>
<style id="BUTTON"
backgroundImageId="btn_background"
align="Center"
@ -29,6 +31,12 @@
<state state_enabled="false" textColor="#80000000"/>
<state state_enabled="true" state_hovered="true" textColor="#006080"/>
</style>
<style id="BUTTON_LABEL_LINK" parent="BUTTON_LABEL"
textColor="#0000C0"
>
<state state_enabled="false" textColor="#60C0C0FF"/>
<state state_enabled="true" state_hovered="true" textColor="#8080FF" textFlags="Underline"/>
</style>
<style id="BUTTON_IMAGE"
margins="2,2,2,2"
align="Center"
@ -161,7 +169,7 @@
<style id="MAIN_MENU"
layoutWidth="FILL_PARENT"
backgroundColor="#EFEFF2"
backgroundColor="#d6dbe9"
layoutWeight="0"
/>
<style id="MAIN_MENU_ITEM"

1
views/standard_resources.list
View File

@ -189,6 +189,7 @@ res/tab_up_background_focused.9.png
res/tab_up_background_focused_dark.9.png
res/tab_up_background_selected.9.png
res/tab_up_background_selected_dark.9.png
res/tab_up_background_theme_dark.xml
res/theme_default.xml
res/theme_dark.xml
res/toolbar_button_background.xml