TAPAAL

Merge lp:~yrke/tapaal/fix1947517-3_9 into lp:tapaal/3.9

  1. fix1947517-3_9
  2. Merge into 3.9
Proposed by Kenneth Yrke Jørgensen
Status: Rejected
Rejected by: Kenneth Yrke Jørgensen
Proposed branch: lp:~yrke/tapaal/fix1947517-3_9
Merge into: lp:tapaal/3.9
Diff against target: 26 lines (+5/-1)
2 files modified
src/dk/aau/cs/gui/TabContent.java (+4/-0)
src/pipe/gui/handler/ArcPathPointHandler.java (+1/-1)
To merge this branch: bzr merge lp:~yrke/tapaal/fix1947517-3_9
Reviewer Review Type Date Requested Status
TAPAAL Maintainers Pending
Review via email: mp+411215@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/gui/TabContent.java'
2--- src/dk/aau/cs/gui/TabContent.java 2021-10-15 14:47:54 +0000
3+++ src/dk/aau/cs/gui/TabContent.java 2021-11-03 10:12:32 +0000
4@@ -2738,6 +2738,10 @@
5 e-> ((Arc) e.pno).getMouseHandler().getPopup(e.e).show(e.pno, e.e.getX(), e.e.getY())
6 );
7 registerEvent(
8+ e->e.pno instanceof ArcPathPoint && e.a == MouseAction.rightClicked,
9+ e-> ((ArcPathPoint) e.pno).getMouseHandler().getPopup(e.e).show(e.pno, e.e.getX(), e.e.getY())
10+ );
11+ registerEvent(
12 e->e.pno instanceof AnnotationNote && e.a == MouseAction.doubleClicked,
13 e-> ((AnnotationNote) e.pno).enableEditMode()
14 );
15
16=== modified file 'src/pipe/gui/handler/ArcPathPointHandler.java'
17--- src/pipe/gui/handler/ArcPathPointHandler.java 2020-10-09 09:58:09 +0000
18+++ src/pipe/gui/handler/ArcPathPointHandler.java 2021-11-03 10:12:32 +0000
19@@ -37,7 +37,7 @@
20 popup.insert(new JPopupMenu.Separator(), 0);
21
22 if (((ArcPathPoint) myObject).getIndex() == 0) {
23- return null;
24+ return popup;
25 } else {
26 JMenuItem menuItem = new JMenuItem(new ToggleArcPointAction((ArcPathPoint) myObject));
27

Subscribers

People subscribed via source and target branches