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

dark theme fixes

This commit is contained in:
Vadim Lopatin 2015-03-10 13:32:22 +03:00
parent 9ba372a504
commit a740aa0f0c
6 changed files with 72 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dlangui/widgets/editors.d
View File

@ -233,6 +233,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
protected uint _leftPaneLineNumberBackgroundColor = 0xF0F0F0;
protected uint _caretColor = 0x000000;
protected uint _caretColorReplace = 0x808080FF;
protected uint _matchingBracketHightlightColor = 0x60FFE0B0;
protected uint _iconsPaneWidth = 16;
protected uint _foldingPaneWidth = 12;
protected uint _modificationMarksPaneWidth = 4;
@ -810,6 +811,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
_leftPaneBackgroundColor3 = style.customColor("editor_left_pane_background3");
_leftPaneLineNumberColor = style.customColor("editor_left_pane_line_number_text");
_leftPaneLineNumberBackgroundColor = style.customColor("editor_left_pane_line_number_background");
_matchingBracketHightlightColor = style.customColor("editor_matching_bracket_highlight");
super.onThemeChanged();
}
@ -1490,6 +1492,7 @@ class EditLine : EditWidgetBase {
wantTabs = false;
styleId = STYLE_EDIT_LINE;
text = initialContent;
onThemeChanged();
}
protected dstring _measuredText;
@ -1684,8 +1687,8 @@ class EditBox : EditWidgetBase {
new Action(EditorActions.ZoomIn, KeyCode.ADD, KeyFlag.Control),
new Action(EditorActions.ZoomOut, KeyCode.SUB, KeyFlag.Control),
]);
onThemeChanged();
}
protected uint _matchingBracketHightlightColor = 0x60FFE0B0;
protected int _firstVisibleLine;

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

@ -289,6 +289,14 @@ class GridWidgetBase : ScrollWidgetBase {
/// set row count
@property GridWidgetBase rows(int r) { resize(cols, r); return this; }
protected uint _selectionColor = 0x804040FF;
protected uint _selectionColorRowSelect = 0xC0A0B0FF;
protected uint _fixedCellBackgroundColor = 0xC0E0E0E0;
protected uint _cellBorderColor = 0xC0C0C0C0;
protected uint _cellHeaderBorderColor = 0xC0202020;
protected uint _cellHeaderBackgroundColor = 0xC0909090;
protected uint _cellHeaderSelectedBackgroundColor = 0x80FFC040;
/// row header column count
@property int headerCols() { return _headerCols; }
@property GridWidgetBase headerCols(int c) {
@ -1171,13 +1179,16 @@ class StringGridWidget : StringGridWidgetBase {
this(string ID) {
super(ID);
styleId = STYLE_EDIT_BOX;
onThemeChanged();
}
/// get cell text
override dstring cellText(int col, int row) {
if (col >= 0 && col < cols && row >= 0 && row < rows)
return _data[row][col];
return ""d;
}
/// set cell text
override StringGridWidgetBase setCellText(int col, int row, dstring text) {
if (col >= 0 && col < cols && row >= 0 && row < rows)
@ -1288,18 +1299,31 @@ class StringGridWidget : StringGridWidgetBase {
if (_rowSelect && selectedRow)
selectedCell = true;
// draw header cell background
uint cl = 0xC0909090;
uint cl = _cellHeaderBackgroundColor;
if (c >= _headerCols || r >= _headerRows) {
if (c < _headerCols && selectedRow)
cl = 0x80FFC040;
cl = _cellHeaderSelectedBackgroundColor;
if (r < _headerRows && selectedCol)
cl = 0x80FFC040;
cl = _cellHeaderSelectedBackgroundColor;
}
buf.fillRect(rc, cl);
buf.fillRect(vborder, 0xC0202020);
buf.fillRect(hborder, 0xC0202020);
buf.fillRect(vborder, _cellHeaderBorderColor);
buf.fillRect(hborder, _cellHeaderBorderColor);
}
/// handle theme change: e.g. reload some themed resources
override void onThemeChanged() {
_selectionColor = style.customColor("grid_selection_color", 0x804040FF);
_selectionColorRowSelect = style.customColor("grid_selection_color_row", 0xC0A0B0FF);
_fixedCellBackgroundColor = style.customColor("grid_cell_background_fixed", 0xC0E0E0E0);
_cellBorderColor = style.customColor("grid_cell_border_color", 0xC0C0C0C0);
_cellHeaderBorderColor = style.customColor("grid_cell_border_color_header", 0xC0202020);
_cellHeaderBackgroundColor = style.customColor("grid_cell_background_header", 0xC0909090);
_cellHeaderSelectedBackgroundColor = style.customColor("grid_cell_background_header_selected", 0x80FFC040);
super.onThemeChanged();
}
/// draw cell background
protected override void drawCellBackground(DrawBuf buf, Rect rc, int c, int r) {
Rect vborder = rc;
@ -1315,15 +1339,15 @@ class StringGridWidget : StringGridWidgetBase {
// normal cell background
if (c < _fixedCols || r < _fixedRows) {
// fixed cell background
buf.fillRect(rc, 0xC0E0E0E0);
buf.fillRect(rc, _fixedCellBackgroundColor);
}
buf.fillRect(vborder, 0xC0C0C0C0);
buf.fillRect(hborder, 0xC0C0C0C0);
buf.fillRect(vborder, _cellBorderColor);
buf.fillRect(hborder, _cellBorderColor);
if (selectedCell) {
if (_rowSelect)
buf.drawFrame(rc, 0xC0A0B0FF, Rect(0,1,0,1), 0xE0FFFF40);
buf.drawFrame(rc, _selectionColorRowSelect, Rect(0,1,0,1), _cellBorderColor);
else
buf.drawFrame(rc, 0x804040FF, Rect(1,1,1,1), 0xE0FFFF40);
buf.drawFrame(rc, _selectionColor, Rect(1,1,1,1), _cellBorderColor);
}
}

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

@ -1234,7 +1234,7 @@ bool loadStyleAttributes(Style style, Element elem, bool allowStates) {
uint stateValue = 0;
extractStateFlags(item.tag.attr, stateMask, stateValue);
if (stateMask) {
Style state = style.createState(stateMask, stateValue);
Style state = style.getOrCreateState(stateMask, stateValue);
loadStyleAttributes(state, item, false);
}
} else if (item.tag.name.equal("drawable")) {

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: 490 B

After

Width:  |  Height:  |  Size: 491 B

34
views/res/theme_dark.xml
View File

@ -10,6 +10,7 @@
<color id="edit_background" value="#070808"/>
<color id="edit_caret" value="#E0E0E0"/>
<color id="edit_caret_replace" value="#808080FF"/>
<color id="editor_matching_bracket_highlight" value="#40606000"/>
<color id="editor_selection_focused" value="#B080B0FF"/>
<color id="editor_selection_normal" value="#D080C0FF"/>
<color id="editor_left_pane_background" value="#030305"/>
@ -18,6 +19,14 @@
<color id="editor_left_pane_line_number_text" value="#707070"/>
<color id="editor_left_pane_line_number_background" value="#060606"/>
<color id="grid_selection_color" value="#60909040"/>
<color id="grid_selection_color_row" value="#60A0A040"/>
<color id="grid_cell_background_fixed" value="#C0404040"/>
<color id="grid_cell_border_color" value="#C0808080"/>
<color id="grid_cell_border_color_header" value="#80000000"/>
<color id="grid_cell_background_header" value="#C0808080"/>
<color id="grid_cell_background_header_selected" value="#40B0B060"/>
<style id="BUTTON"
backgroundImageId="btn_background_dark"
align="Center"
@ -26,7 +35,7 @@
textFlags="UnderlineHotKeys"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="true" state_hovered="true" textColor="#FF0000"/>
<state state_enabled="true" state_hovered="true" textColor="#E0E080"/>
</style>
<style id="BUTTON_TRANSPARENT"
backgroundImageId="btn_background_transparent_dark"
@ -36,16 +45,18 @@
layoutWidth="FILL_PARENT"
margins="2,2,2,2"
align="Left|VCenter"
focusRectColors="#FFF"
textFlags="UnderlineHotKeys"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="true" state_hovered="true" textColor="#FF0000"/>
<state state_enabled="true" state_hovered="true" textColor="#E0E080"/>
</style>
<style id="BUTTON_LABEL_LINK" parent="BUTTON_LABEL"
textColor="#2020FF"
focusRectColors="#FFF"
>
<state state_enabled="false" textColor="#60FFFFFF"/>
<state state_enabled="true" state_hovered="true" textColor="#E0E0FF" textFlags="Underline"/>
<state state_enabled="true" state_hovered="true" textColor="#A0A0FF" textFlags="Underline"/>
</style>
<style id="BUTTON_IMAGE"
margins="2,2,2,2"
@ -77,6 +88,7 @@
/>
<style id="RADIOBUTTON_LABEL" parent="CHECKBOX_LABEL"
align="Left|VCenter"
focusRectColors="#FFF"
>
<state state_enabled="true" state_hovered="true" textColor="#C0FFFF"/>
</style>
@ -210,20 +222,20 @@
align="Left|VCenter"
textFlags="UnderlineHotKeys"
>
<state state_enabled="false" textColor="#FFFFFF"/>
<state state_enabled="false" textColor="#808080"/>
</style>
<style id="MAIN_MENU_LABEL"
margins="4,2,4,2"
align="Left|VCenter"
textFlags="Parent"
>
<state state_enabled="false" textColor="#FFFFFF"/>
<state state_enabled="false" textColor="#808080"/>
</style>
<style id="MENU_ACCEL"
margins="4,2,4,2"
align="Left|VCenter"
>
<state state_enabled="false" textColor="#FFFFFF"/>
<state state_enabled="false" textColor="#808080"/>
</style>
<style id="TRANSPARENT_BUTTON_BACKGROUND"
backgroundImageId="btn_background_transparent_dark"
@ -277,7 +289,7 @@
layoutWeight="0"
/>
<style id="DOCK_HOST"
backgroundColor="#192935"
backgroundColor="#091925"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
padding="2,2,2,2"
@ -303,13 +315,13 @@
margins="4,4,4,4"
/>
<style id="DOCK_WINDOW_CAPTION"
backgroundColor="#4d6082"
backgroundColor="#3d5072"
layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT"
padding="1,1,1,1"
/>
<style id="DOCK_WINDOW_CAPTION_LABEL"
textColor="#FFFFFF"
textColor="#E0E0E0"
layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT"
padding="3,3,3,3"
@ -324,7 +336,7 @@
/>
<style id="TOOLBAR_HOST"
backgroundColor="#202020"
backgroundColor="#202325"
layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT"
padding="1,1,1,1"
@ -335,7 +347,7 @@
layoutHeight="WRAP_CONTENT"
margins="2,7,2,1"
padding="3,3,3,3"
textColor="#404040"
textColor="#E0E0E0"
/>
<style id="TOOLBAR"
backgroundImageId="toolbar_background_dark"

10
views/res/theme_default.xml
View File

@ -9,6 +9,7 @@
<color id="edit_background" value="#FFFFFF"/>
<color id="edit_caret" value="#000000"/>
<color id="edit_caret_replace" value="#808080FF"/>
<color id="editor_matching_bracket_highlight" value="#60FFE0B0"/>
<color id="editor_selection_focused" value="#B060A0FF"/>
<color id="editor_selection_normal" value="#D060A0FF"/>
<color id="editor_left_pane_background" value="#F4F4F4"/>
@ -17,6 +18,14 @@
<color id="editor_left_pane_line_number_text" value="#4060D0"/>
<color id="editor_left_pane_line_number_background" value="#F0F0F0"/>
<color id="grid_selection_color" value="#804040FF"/>
<color id="grid_selection_color_row" value="#C0A0B0FF"/>
<color id="grid_cell_background_fixed" value="#C0E0E0E0"/>
<color id="grid_cell_border_color" value="#C0C0C0C0"/>
<color id="grid_cell_border_color_header" value="#C0202020"/>
<color id="grid_cell_background_header" value="#C0909090"/>
<color id="grid_cell_background_header_selected" value="#80FFC040"/>
<style id="BUTTON"
backgroundImageId="btn_background"
align="Center"
@ -76,6 +85,7 @@
/>
<style id="RADIOBUTTON_LABEL" parent="CHECKBOX_LABEL"
align="Left|VCenter"
focusRectColors="#000"
>
<state state_enabled="true" state_hovered="true" textColor="#006080"/>
</style>