From 89b7dac5b87b0b368043ea5373b4f7a61be7624b Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 5 Oct 2014 18:56:13 +0200 Subject: [PATCH] Moved window icon code to main class --- src/main/java/io/bitsquare/BitSquare.java | 8 ++++++++ src/main/java/io/bitsquare/gui/main/MainViewCB.java | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java index c09c13c12e..51e21a818e 100644 --- a/src/main/java/io/bitsquare/BitSquare.java +++ b/src/main/java/io/bitsquare/BitSquare.java @@ -22,6 +22,7 @@ import io.bitsquare.di.BitSquareModule; import io.bitsquare.gui.AWTSystemTray; import io.bitsquare.gui.Navigation; import io.bitsquare.gui.components.Popups; +import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.Profiler; import io.bitsquare.msg.MessageFacade; import io.bitsquare.msg.SeedNodeAddress; @@ -42,6 +43,7 @@ import java.util.List; import javafx.application.Application; import javafx.scene.*; +import javafx.scene.image.*; import javafx.scene.input.*; import javafx.stage.Stage; @@ -140,6 +142,12 @@ public class BitSquare extends Application { primaryStage.setTitle("BitSquare (" + APP_NAME + ")"); + // sometimes there is a rendering bug, see https://github.com/bitsquare/bitsquare/issues/160 + if (ImageUtil.isRetina()) + primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/images/window_icon@2x.png"))); + else + primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/images/window_icon.png"))); + ViewLoader.setInjector(injector); final ViewLoader loader = diff --git a/src/main/java/io/bitsquare/gui/main/MainViewCB.java b/src/main/java/io/bitsquare/gui/main/MainViewCB.java index e89d5f8ba2..bc361d666d 100644 --- a/src/main/java/io/bitsquare/gui/main/MainViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/MainViewCB.java @@ -25,7 +25,6 @@ import io.bitsquare.gui.ViewCB; import io.bitsquare.gui.components.NetworkSyncPane; import io.bitsquare.gui.components.Popups; import io.bitsquare.gui.components.SystemNotification; -import io.bitsquare.gui.util.ImageUtil; import io.bitsquare.gui.util.Profiler; import io.bitsquare.gui.util.Transitions; import io.bitsquare.trade.TradeManager; @@ -222,13 +221,6 @@ public class MainViewCB extends ViewCB { if (ordersButtonButtonPane.getChildren().size() > 1) ordersButtonButtonPane.getChildren().remove(1); } - - if (ImageUtil.isRetina()) - BitSquare.getPrimaryStage().getIcons().add(new Image(getClass().getResourceAsStream - ("/images/window_icon@2x.png"))); - else - BitSquare.getPrimaryStage().getIcons().add(new Image(getClass().getResourceAsStream("/images/window_icon" + - ".png"))); } private void onMainNavigationAdded() {