From 2b913d0e943b43f3d22975b47688ad9cbb5b8817 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Nov 2026 17:55:00 +0100 Subject: [PATCH] fixes some SWT errors --- .../database/ui/swt/internal/WaveformCanvas.java | 6 ++++-- .../database/ui/swt/internal/WaveformView.java | 10 ++++++++++ .../minres/scviewer/database/ui/swt/sb/Direction.java | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java index 66ef070..59c3a74 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java @@ -456,7 +456,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ if (currentSelection != null) reveal(currentSelection); arrowPainter.setTx(currentSelection); - redraw(); + if(!isDisposed()) + redraw(); } public void reveal(ITx tx) { @@ -601,7 +602,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ public void setStyleProvider(IWaveformStyleProvider styleProvider) { this.styleProvider=styleProvider; - redraw(); + if(!isDisposed()) + redraw(); } public int getScaleMagnitude() { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index 0637cd9..0ef13fc 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -531,6 +531,16 @@ public class WaveformView implements IWaveformView { } } }); + getControl().addListener(SWT.Resize, (evt) -> { + int y = waveformCanvas.getVerticalBar().getSelection(); + nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y); + valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y); + }); + getControl().addListener(SWT.Move, (evt) -> { + int y = waveformCanvas.getVerticalBar().getSelection(); + nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y); + valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y); + }); } private Control createFill(Composite pane) { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/sb/Direction.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/sb/Direction.java index f2678ae..873ed2e 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/sb/Direction.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/sb/Direction.java @@ -21,7 +21,7 @@ enum Direction { } private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) { - return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width ); + return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).width ); } private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) { @@ -61,7 +61,7 @@ enum Direction { @Override protected void expand( Control control, int maxExpansion ) { Rectangle bounds = control.getBounds(); - int expand = expand( bounds.height, maxExpansion ); + int expand = super.expand( bounds.height, maxExpansion ); control.setBounds( bounds.x, bounds.y - expand, bounds.width, bounds.height + expand ); } }, @@ -75,7 +75,7 @@ enum Direction { } private ComponentDistribution calculateComponentDistribution( FlatScrollBar scrollBar, int buttonLength ) { - return calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height ); + return Direction.calculateComponentDistribution( scrollBar, buttonLength, getControlBounds( scrollBar ).height ); } private Rectangle[] calculateComponentBounds( ComponentDistribution distribution, FlatScrollBar scrollBar ) { @@ -115,7 +115,7 @@ enum Direction { @Override protected void expand( Control control, int maxExpansion ) { Rectangle bounds = control.getBounds(); - int expand = expand( bounds.width, maxExpansion ); + int expand = super.expand( bounds.width, maxExpansion ); control.setBounds( bounds.x - expand, bounds.y, bounds.width + expand, bounds.height ); } };