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

fix grid focus

This commit is contained in:
Vadim Lopatin 2014-12-22 11:12:57 +03:00
parent eda23b1bc6
commit 570b7f0c92
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dlangui/dialogs/filedlg.d
View File

@ -239,5 +239,7 @@ class FileDialog : Dialog, CustomGridCellAdapter {
openDirectory(currentDir); openDirectory(currentDir);
_fileList.layoutHeight = FILL_PARENT; _fileList.layoutHeight = FILL_PARENT;
_fileList.setFocus();
} }
} }

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

@ -642,6 +642,8 @@ class GridWidgetBase : ScrollWidgetBase {
normalCell = c >= _headerCols && r >= _headerRows; normalCell = c >= _headerCols && r >= _headerRows;
} }
if (event.action == MouseAction.ButtonDown && event.button == MouseButton.Left) { if (event.action == MouseAction.ButtonDown && event.button == MouseButton.Left) {
if (canFocus && !focused)
setFocus();
if (cellFound && normalCell) { if (cellFound && normalCell) {
if (c == _col && r == _row && event.doubleClick) { if (c == _col && r == _row && event.doubleClick) {
activateCell(c, r); activateCell(c, r);
@ -1266,15 +1268,17 @@ class StringGridWidget : StringGridWidgetBase {
vborder.left = vborder.right - 1; vborder.left = vborder.right - 1;
hborder.top = hborder.bottom - 1; hborder.top = hborder.bottom - 1;
hborder.right--; hborder.right--;
bool selectedCol = c == col; bool selectedCol = (c == col) && !_rowSelect;
bool selectedRow = r == row; bool selectedRow = r == row;
bool selectedCell = selectedCol && selectedRow; bool selectedCell = selectedCol && selectedRow;
if (_rowSelect && selectedRow) if (_rowSelect && selectedRow)
selectedCell = true; selectedCell = true;
// draw header cell background // draw header cell background
uint cl = 0x80909090; uint cl = 0x80909090;
if (!_rowSelect || col < _headerCols) { if (c >= _headerCols || r >= _headerRows) {
if (selectedCol || selectedRow) if (c < _headerCols && selectedRow)
cl = 0x80FFC040;
if (r < _headerRows && selectedCol)
cl = 0x80FFC040; cl = 0x80FFC040;
} }
buf.fillRect(rc, cl); buf.fillRect(rc, cl);