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

fix grid styles in console mode

This commit is contained in:
Vadim Lopatin 2016-09-09 10:25:52 +03:00
parent 9b40d4cd10
commit 8abed864d1
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1435,8 +1435,10 @@ class StringGridWidget : StringGridWidgetBase {
cl = _cellHeaderSelectedBackgroundColor;
}
buf.fillRect(rc, cl);
buf.drawLine(Point(rc.right, rc.bottom), Point(rc.right, rc.top), _cellHeaderBorderColor); // vertical
buf.drawLine(Point(rc.left, rc.bottom), Point(rc.right - 1, rc.bottom), _cellHeaderBorderColor); // horizontal
static if (BACKEND_GUI) {
buf.drawLine(Point(rc.right, rc.bottom), Point(rc.right, rc.top), _cellHeaderBorderColor); // vertical
buf.drawLine(Point(rc.left, rc.bottom), Point(rc.right - 1, rc.bottom), _cellHeaderBorderColor); // horizontal
}
}
/// draw cell background
@ -1451,13 +1453,22 @@ class StringGridWidget : StringGridWidgetBase {
// fixed cell background
buf.fillRect(rc, _fixedCellBackgroundColor);
}
buf.drawLine(Point(rc.left, rc.bottom + 1), Point(rc.left, rc.top), _cellBorderColor); // vertical
buf.drawLine(Point(rc.left, rc.bottom), Point(rc.right - 1, rc.bottom), _cellBorderColor); // horizontal
static if (BACKEND_GUI) {
buf.drawLine(Point(rc.left, rc.bottom + 1), Point(rc.left, rc.top), _cellBorderColor); // vertical
buf.drawLine(Point(rc.left, rc.bottom), Point(rc.right - 1, rc.bottom), _cellBorderColor); // horizontal
}
if (selectedCell) {
if (_rowSelect)
buf.drawFrame(rc, _selectionColorRowSelect, Rect(0,1,0,1), _cellBorderColor);
else
buf.drawFrame(rc, _selectionColor, Rect(1,1,1,1), _cellBorderColor);
static if (BACKEND_GUI) {
if (_rowSelect)
buf.drawFrame(rc, _selectionColorRowSelect, Rect(0,1,0,1), _cellBorderColor);
else
buf.drawFrame(rc, _selectionColor, Rect(1,1,1,1), _cellBorderColor);
} else {
if (_rowSelect)
buf.fillRect(rc, _selectionColorRowSelect);
else
buf.fillRect(rc, _selectionColor);
}
}
}

10
views/res/console_theme_default.xml
View File

@ -22,13 +22,13 @@
<color id="editor_left_pane_line_icon_color_bookmark" value="#0000FF"/>
<color id="editor_left_pane_line_icon_color_error" value="#80FF0000"/>
<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_selection_color" value="#808000"/>
<color id="grid_selection_color_row" value="#808000"/>
<color id="grid_cell_background_fixed" value="#808080"/>
<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"/>
<color id="grid_cell_background_header" value="#808080"/>
<color id="grid_cell_background_header_selected" value="#008000"/>
<style id="BUTTON"
backgroundImageId="{' ' bc 0x808080 stretch}"