You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2022/10/30 14:19:08 UTC
[netbeans] branch delivery updated: about panel needs a vertical scrollbar if the async plugin update notification appears.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new e9b8b8e55f about panel needs a vertical scrollbar if the async plugin update notification appears.
new 965f7ea535 Merge pull request #4877 from mbien/about-window-update-fix
e9b8b8e55f is described below
commit e9b8b8e55fb9a1f55bbaaa640d07bfed266f7160
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Fri Oct 28 04:17:48 2022 +0200
about panel needs a vertical scrollbar if the async plugin update
notification appears.
we can't add it right away, otherwise the window can't layout itself.
---
.../o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.form | 2 --
.../o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.form b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.form
index 0bef3f729a..94d89c57e9 100644
--- a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.form
+++ b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.form
@@ -141,8 +141,6 @@
<Property name="verticalScrollBarPolicy" type="int" value="21"/>
</Properties>
<AuxValues>
- <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
- <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
diff --git a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
index 78097f741b..a6d3b7f1f8 100644
--- a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
+++ b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
import javax.swing.Icon;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
+import javax.swing.ScrollPaneConstants;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.event.HyperlinkEvent;
@@ -102,6 +103,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
final String updates = getUpdates();
SwingUtilities.invokeLater(() -> {
description.setText(LBL_description(getProductVersionValue(), getJavaValue(), getVMValue(), getOperatingSystemValue(), getEncodingValue(), getSystemLocaleValue(), getUserDirValue(), Places.getCacheDirectory().getAbsolutePath(), updates, FONT_SIZE, getJavaRuntime()));
+ descriptionScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); // will need a scrollbar now
description.setCursor(null);
description.revalidate();
description.setCaretPosition(0);
@@ -156,7 +158,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
javax.swing.JButton closeButton = new javax.swing.JButton();
javax.swing.JScrollPane copyrightScrollPane = new javax.swing.JScrollPane();
copyright = new javax.swing.JTextPane();
- javax.swing.JScrollPane descriptionScrollPane = new javax.swing.JScrollPane();
+ descriptionScrollPane = new javax.swing.JScrollPane();
description = new javax.swing.JTextPane();
javax.swing.JPanel imagePanel = new javax.swing.JPanel();
imageLabel = new javax.swing.JLabel();
@@ -242,6 +244,7 @@ private void closeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTextPane copyright;
private javax.swing.JTextPane description;
+ private javax.swing.JScrollPane descriptionScrollPane;
private javax.swing.JLabel imageLabel;
// End of variables declaration//GEN-END:variables
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists