Skip to content

Commit d9454c5

Browse files
committed
Fix the icons look on Windows.
1 parent 69304d4 commit d9454c5

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

src/main/java/fiji/plugin/trackmate/helper/ui/ParameterSweepController.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.awt.event.WindowAdapter;
2525
import java.io.File;
26+
import java.util.Arrays;
2627

2728
import javax.swing.JFrame;
2829
import javax.swing.JOptionPane;
@@ -79,7 +80,11 @@ public void windowClosing( final java.awt.event.WindowEvent e )
7980
crawler.stopWatching();
8081
}
8182
} );
82-
frame.setIconImage( GuiUtils.HELPER_ICON_BIG.getImage() );
83+
frame.setIconImages( Arrays.asList(
84+
GuiUtils.HELPER_ICON_16x16.getImage(),
85+
GuiUtils.HELPER_ICON.getImage(),
86+
GuiUtils.HELPER_ICON_BIG.getImage()
87+
) );
8388
frame.getContentPane().add( gui );
8489
frame.setSize( 600, 700 );
8590
frame.setLocationRelativeTo( null );

src/main/java/fiji/plugin/trackmate/helper/ui/ParameterSweepPanel.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import static fiji.plugin.trackmate.gui.Icons.EXECUTE_ICON;
2929
import static fiji.plugin.trackmate.gui.Icons.REVERT_ICON;
3030
import static fiji.plugin.trackmate.helper.ui.components.GuiUtils.HELPER_ICON;
31+
import static fiji.plugin.trackmate.helper.ui.components.GuiUtils.HELPER_ICON_16x16;
3132

3233
import java.awt.BorderLayout;
3334
import java.awt.Desktop;
@@ -46,6 +47,7 @@
4647

4748
import javax.swing.Box;
4849
import javax.swing.BoxLayout;
50+
import javax.swing.ImageIcon;
4951
import javax.swing.JButton;
5052
import javax.swing.JCheckBox;
5153
import javax.swing.JLabel;
@@ -133,15 +135,15 @@ public ParameterSweepPanel(
133135
tabbedPane.addTab( "Log", null, panelLog, null );
134136

135137
final CrawlerResultsPanel bestParamsPanel = new CrawlerResultsPanel( crawler, imp );
136-
tabbedPane.addTab( "Best params", HELPER_ICON, bestParamsPanel, null );
138+
tabbedPane.addTab( "Best params", HELPER_ICON_16x16, bestParamsPanel, null );
137139

138140
panelSpotFilters = new SpotFilterConfigPanel( Spot.QUALITY, imp, model );
139141
tabbedPane.addTab( "Spot filters", Icons.SPOT_ICON_16x16, panelSpotFilters, null );
140142
// Enabler.
141143
enablers.add( new EverythingDisablerAndReenabler( panelSpotFilters, new Class[] { JLabel.class } ) );
142144

143145
panelTrackFilters = new TrackFilterConfigPanel( TrackBranchingAnalyzer.NUMBER_SPOTS, imp, model );
144-
tabbedPane.addTab( "Track filters", Icons.TRACK_ICON_64x64, panelTrackFilters, null );
146+
tabbedPane.addTab( "Track filters", Icons.TRACK_SCHEME_ICON_16x16, panelTrackFilters, null );
145147
// Enabler.
146148
enablers.add( new EverythingDisablerAndReenabler( panelTrackFilters, new Class[] { JLabel.class } ) );
147149

@@ -274,7 +276,8 @@ public void mouseClicked( final java.awt.event.MouseEvent e )
274276
final ActionListener al = l -> {
275277
if ( chkbox.isSelected() )
276278
{
277-
tabbedPane.addTab( name, dm.getIcon(), panel, null );
279+
final ImageIcon smallIcon = fiji.plugin.trackmate.gui.GuiUtils.scaleImage( dm.getIcon(), 16, 16 );
280+
tabbedPane.addTab( name, smallIcon, panel, null );
278281
model.setActive( name, true );
279282
}
280283
else

src/main/java/fiji/plugin/trackmate/helper/ui/components/GuiUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public class GuiUtils
3232

3333
public static final ImageIcon HELPER_ICON = new ImageIcon( GuiUtils.class.getResource( "/images/TrackMate-Helper-logo-64px.png" ) );
3434

35+
public static final ImageIcon HELPER_ICON_16x16 = fiji.plugin.trackmate.gui.GuiUtils.scaleImage( HELPER_ICON, 16, 16 );
36+
3537
public static final ImageIcon HELPER_ICON_BIG = new ImageIcon( GuiUtils.class.getResource( "/images/TrackMate-Helper-logo.png" ) );
3638

3739
public static void changeFont( final Component component, final Font font )

0 commit comments

Comments
 (0)