From 73314752e225459a1a377b57fbaa8b062ff25f7f Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Fri, 18 Dec 2015 10:30:04 +0300
Subject: [PATCH] fixes for dlangide

---
 src/dlangui/dialogs/filedlg.d |  4 ++--
 src/dlangui/widgets/grid.d    | 16 ++++++----------
 src/dlangui/widgets/scroll.d  |  3 +++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/dlangui/dialogs/filedlg.d b/src/dlangui/dialogs/filedlg.d
index aa64e9da..bb0c6f3f 100644
--- a/src/dlangui/dialogs/filedlg.d
+++ b/src/dlangui/dialogs/filedlg.d
@@ -448,10 +448,10 @@ class FileDialog : Dialog, CustomGridCellAdapter {
         }
 
         _fileList.customCellAdapter = this;
-        _fileList.onCellActivated = delegate(GridWidgetBase source, int col, int row) {
+        _fileList.cellActivated = delegate(GridWidgetBase source, int col, int row) {
             onItemActivated(row);
         };
-        _fileList.onCellSelected = delegate(GridWidgetBase source, int col, int row) {
+        _fileList.cellSelected = delegate(GridWidgetBase source, int col, int row) {
             onItemSelected(row);
         };
 
diff --git a/src/dlangui/widgets/grid.d b/src/dlangui/widgets/grid.d
index 683c81c1..2d7dc070 100644
--- a/src/dlangui/widgets/grid.d
+++ b/src/dlangui/widgets/grid.d
@@ -241,13 +241,9 @@ interface ViewScrolledHandler {
 class GridWidgetBase : ScrollWidgetBase, GridModelAdapter {
     /// Callback to handle selection change
     Listener!CellSelectedHandler cellSelected;
-    /// cellSelected signal alias for backward compatibility; will be deprecated in future
-    alias onCellSelected = cellSelected;
 
     /// Callback to handle cell double click
     Listener!CellActivatedHandler cellActivated;
-    /// cellActivated signal alias for backward compatibility; will be deprecated in future
-    alias onCellActivated = cellActivated;
 
     /// Callback for handling of view scroll (top left visible cell change)
     Listener!ViewScrolledHandler viewScrolled;
@@ -685,8 +681,8 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter {
         calcScrollableAreaPos();
         if (makeVisible)
             makeCellVisible(_col, _row);
-        if (needNotification && onCellSelected.assigned)
-            onCellSelected(source, _col - _headerCols, _row - _headerRows);
+        if (needNotification && cellSelected.assigned)
+            cellSelected(source, _col - _headerCols, _row - _headerRows);
         return true;
     }
 
@@ -695,8 +691,8 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter {
         if (_col != col || _row != row) {
             selectCell(col, row, true);
         }
-        if (onCellActivated.assigned)
-            onCellActivated(this, this.col, this.row);
+        if (cellActivated.assigned)
+            cellActivated(this, this.col, this.row);
         return true;
     }
 
@@ -876,8 +872,8 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter {
 
 		switch (actionId) {
             case GridActions.ActivateCell:
-                if (onCellActivated.assigned) {
-                    onCellActivated(this, col, row);
+                if (cellActivated.assigned) {
+                    cellActivated(this, col, row);
                     return true;
                 }
                 return false;
diff --git a/src/dlangui/widgets/scroll.d b/src/dlangui/widgets/scroll.d
index 2ae7b458..48010ec3 100644
--- a/src/dlangui/widgets/scroll.d
+++ b/src/dlangui/widgets/scroll.d
@@ -121,6 +121,9 @@ class ScrollWidgetBase :  WidgetGroup, OnScrollHandler {
         }
     }
 
+    /// returns client area rectangle
+	@property Rect clientRect() { return _clientRect; }
+
     /// process horizontal scrollbar event
     bool onHScroll(ScrollEvent event) {
         return true;