From a28a30d0f4db2367ef933506cec90b04bb034c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Mon, 10 Oct 2016 16:42:40 +0000 Subject: [PATCH] [GB.GUI.BASE] * BUG: GridView: Stop the scrolling timer when focus is lost, as if you open a modal dialog during a MouseDown event, you don't get the MouseUp event! Maybe I should systematically raise a fake MouseUp event when focus is lost, and QT didn't send it. git-svn-id: svn://localhost/gambas/trunk@7930 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.gui.base/.info | 4 ++++ comp/src/gb.gui.base/.src/GridView/GridView.class | 13 ++++++------- comp/src/gb.gui.base/.startup | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/comp/src/gb.gui.base/.info b/comp/src/gb.gui.base/.info index 12308afb8..1e9eb7bd2 100644 --- a/comp/src/gb.gui.base/.info +++ b/comp/src/gb.gui.base/.info @@ -868,6 +868,10 @@ ScrollArea_MouseUp m +ScrollArea_LostFocus +m + + ScrollArea_DragLeave m diff --git a/comp/src/gb.gui.base/.src/GridView/GridView.class b/comp/src/gb.gui.base/.src/GridView/GridView.class index d906e7499..4d6dafbda 100644 --- a/comp/src/gb.gui.base/.src/GridView/GridView.class +++ b/comp/src/gb.gui.base/.src/GridView/GridView.class @@ -1264,7 +1264,7 @@ End ' End Private Sub AfterMouseUp() - + If Me.Design Then Return If _NoMouse Then Return @@ -1285,12 +1285,11 @@ End Public Sub ScrollArea_MouseUp() - 'If $iMode = Select.Multiple And $bInRow And If $iRow = $iMoveSelectRow Then - ' If Mouse.Normal Then - ' $hRows._GetSel().UnSelectAll - ' $hRows.Select($iRow, 1) - ' Endif - 'Endif + AfterMouseUp + +End + +Public Sub ScrollArea_LostFocus() AfterMouseUp diff --git a/comp/src/gb.gui.base/.startup b/comp/src/gb.gui.base/.startup index 627feff68..10e37ff15 100644 --- a/comp/src/gb.gui.base/.startup +++ b/comp/src/gb.gui.base/.startup @@ -2,7 +2,7 @@ FGridView gb.gui.base 0 0 -3.8.90 +3.9.90 gb.image gb.gui