From e3787bd095810049259ccedd563448e287d866a8 Mon Sep 17 00:00:00 2001 From: "ggh1933.go" Date: Tue, 28 Jun 2016 13:49:58 +0900 Subject: [PATCH] [SRADA-846] Make Exceptional ClickEvent disabled on timeLineChart - Abnormal clickEvent don't have "mouseDown" event. - Disabled Abnormal Click make range or marking table or chart. Change-Id: I780de3a4deee92cb95d4fee29bae58848bae8685 --- .../ui/common/TimelineChartMouseEventListener.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java index d9ee305..76a2520 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/common/TimelineChartMouseEventListener.java @@ -83,7 +83,8 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements Mou protected static final int SELECTION_MARKER_INDEX = 0; private static final int SCREENSHOT_DOT_WIDTH = 12; - + private boolean abnormalClicked = true; + public TimelineChartMouseEventListener(DAPopupMenu menu, DATimeline timeline, String pageID) { this.menu = menu; this.timeline = timeline; @@ -101,7 +102,10 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements Mou DAChartPlotIntervalMarker intervalMarker = (DAChartPlotIntervalMarker) marker; double eventTime = plot.getXFromXPixel(e.x); - + + /// abnormal click don't have mouse_up + abnormalClicked = false; + if (e.button == 3) { List itemList = menu.getItems(); for(DAPopupMenuItem item : itemList) { @@ -158,7 +162,13 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements Mou @Override public void mouseUp(MouseEvent e) { - if (e.button == 3) { + int clickcount = e.count; + + if (e.button == 3 || abnormalClicked == true) { + return; + } + /// second click is need to go double click event. + if(clickcount == 2){ return; } @@ -207,6 +217,10 @@ public class TimelineChartMouseEventListener extends MouseAdapter implements Mou @Override public void mouseMove(MouseEvent e) { + /// don't have mouse up click event is abnormal. + if(abnormalClicked) { + return; + } DAChart chart = (DAChart) e.widget; DAChartPlot plot = chart.getPlot(); DAChartPlotMarker marker = plot.getMarkers().get(SELECTION_MARKER_INDEX); -- 2.7.4