From 2bdcb5edf506c770fbf645dad88197037b245ba3 Mon Sep 17 00:00:00 2001 From: Tushar Date: Sun, 23 Dec 2018 00:13:30 +0530 Subject: [PATCH] Fixed update dialog going out of screen. --- .../com/rarchives/ripme/ui/UpdateUtils.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java index 7f745799..e613d996 100644 --- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java +++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java @@ -1,11 +1,14 @@ package com.rarchives.ripme.ui; +import java.awt.Dimension; import java.io.*; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; import org.apache.log4j.Logger; import org.json.JSONArray; @@ -125,13 +128,15 @@ public class UpdateUtils { String latestVersion = ripmeJson.getString("latestVersion"); if (UpdateUtils.isNewerVersion(latestVersion)) { logger.info("Found newer version: " + latestVersion); - int result = JOptionPane.showConfirmDialog( - null, - String.format("New version (%s) is available!" - + "

Recent changes: %s" - + "

Do you want to download and run the newest version?", latestVersion, changeList.replaceAll("\n", "")), - "RipMe Updater", - JOptionPane.YES_NO_OPTION); + JEditorPane changeListPane = new JEditorPane("text/html", String.format( + "New version (%s) is available!" + "

Recent changes: %s" + + "

Do you want to download and run the newest version?", + latestVersion, changeList.replaceAll("\n", "

"))); + changeListPane.setEditable(false); + JScrollPane changeListScrollPane = new JScrollPane(changeListPane); + changeListScrollPane.setPreferredSize(new Dimension(250, 200)); + int result = JOptionPane.showConfirmDialog(null, changeListScrollPane, "RipMe Updater", + JOptionPane.YES_NO_OPTION); if (result != JOptionPane.YES_OPTION) { configUpdateLabel.setText("Current Version: " + getThisJarVersion() + "
Latest version: " + latestVersion + "");