From f4c57282dcf5c05f98db3dcbe062ccc59bfcffb4 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Sun, 3 Jun 2018 23:56:23 +0300 Subject: [PATCH] RSV: sort/filter icons hover area fix --- .../jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java index 8dadb59a3c..a02a85188b 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/lightgrid/GridColumn.java @@ -128,7 +128,9 @@ class GridColumn { int filterEnd = bounds.width - (sortBounds == null ? GridColumnRenderer.ARROW_MARGIN : sortBounds.width + GridColumnRenderer.IMAGE_SPACING); int filterBegin = filterEnd - filterBounds.width; - return x >= filterBegin && x <= filterEnd && y < bounds.y + (filterBounds == null ? 0 : filterBounds.height); + return + x >= filterBegin && x <= filterEnd && + y < bounds.y + (filterBounds == null ? 0 : filterBounds.height) + GridColumnRenderer.TOP_MARGIN; } public boolean isOverSortArrow(int x, int y) @@ -143,7 +145,9 @@ class GridColumn { int arrowEnd = bounds.width - rightMargin + GridColumnRenderer.IMAGE_SPACING; Rectangle sortBounds = GridColumnRenderer.getSortControlBounds(); int arrowBegin = arrowEnd - sortBounds.width; - return x >= arrowBegin && x <= arrowEnd && y < bounds.y + sortBounds.height; + return + x >= arrowBegin && x <= arrowEnd && + y <= bounds.y + sortBounds.height + GridColumnRenderer.TOP_MARGIN; } public boolean isOverIcon(int x, int y) { -- GitLab