Skip to content

Cosmetic change in MainWindow #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tinevez merged 3 commits into from
Apr 28, 2025
Merged

Cosmetic change in MainWindow #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f39685a
Make MainWindow a bit wider
stefanhahmann Apr 23, 2025
d63a619
Set the smaller font for Buttons and Labels as default on Linux/Unix …
Apr 24, 2025
365324a
Use github action setup-java@v4 instead of v2
Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mastodon/mamut/MainWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public MainWindow( final ProjectModel appModel )

// Main Panel
final JPanel buttonsPanel = new JPanel();
buttonsPanel.setLayout( new MigLayout( "wrap 2", "[150px!]10[150px!]" ) );
buttonsPanel.setLayout( new MigLayout( "wrap 2", "[170px!]10[170px!]" ) );

// Project:
final JPanel titlePanel = new JPanel();
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/org/mastodon/mamut/launcher/MastodonLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
*/
package org.mastodon.mamut.launcher;

import java.awt.Font;
import java.awt.datatransfer.DataFlavor;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DropTarget;
Expand All @@ -47,6 +48,7 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.UIManager;

import org.jdom2.JDOMException;
import org.mastodon.app.MastodonIcons;
Expand Down Expand Up @@ -94,6 +96,7 @@ public class MastodonLauncher extends JFrame
public MastodonLauncher( final Context context )
{
super( "Mastodon launcher" );
setFont();
this.context = Optional.ofNullable( context ).orElse( new Context() );

System.setProperty( "apple.laf.useScreenMenuBar", "true" );
Expand Down Expand Up @@ -123,6 +126,27 @@ public MastodonLauncher( final Context context )
setDropTarget( new LauncherDropTarget() );
}

private static void setFont()
{
// Determine the OS and set the font
String os = System.getProperty( "os.name" ).toLowerCase();

if ( os.contains( "nix" ) || os.contains( "nux" ) )
{
Font defaultFont = new Font( "Arial", Font.PLAIN, 12 );
// Set the font for UI components
UIManager.put( "Label.font", defaultFont );
UIManager.put( "Button.font", defaultFont );
UIManager.put( "TextField.font", defaultFont );
UIManager.put( "TextArea.font", defaultFont );
UIManager.put( "ComboBox.font", defaultFont );
UIManager.put( "List.font", defaultFont );
UIManager.put( "Table.font", defaultFont );
UIManager.put( "Menu.font", defaultFont );
UIManager.put( "MenuItem.font", defaultFont );
}
}

private void importSimi()
{
gui.clearLog();
Expand Down