From 5df98152d8a92ed9b87cfeb3189dd4aae171eeeb Mon Sep 17 00:00:00 2001 From: "varsita.narayanasamy" Date: Fri, 17 Dec 2021 17:08:07 +1030 Subject: [PATCH 1/2] added scrollpane to windows notifications panel --- build.gradle | 2 +- .../java/com/notification/types/WindowNotification.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 05200ef..bec504d 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ clean { delete "bin" } -task createPom << { +task createPom doLast { pom { project { groupId 'org.jcommunique' diff --git a/src/main/java/com/notification/types/WindowNotification.java b/src/main/java/com/notification/types/WindowNotification.java index 2f53b31..4a58de6 100644 --- a/src/main/java/com/notification/types/WindowNotification.java +++ b/src/main/java/com/notification/types/WindowNotification.java @@ -5,8 +5,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import javax.swing.JPanel; -import javax.swing.JWindow; +import javax.swing.*; import com.notification.Notification; import com.theme.WindowTheme; @@ -44,7 +43,7 @@ public void mouseClicked(MouseEvent e) { }; setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT); - setPanel(new JPanel()); + setPanel((new JPanel())); } protected JWindow getWindow() { @@ -52,6 +51,8 @@ protected JWindow getWindow() { } protected void setPanel(JPanel panel) { + JScrollPane scrollPane = new JScrollPane(panel); + scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); if (m_panel != null) { m_window.remove(m_panel); m_panel.removeMouseListener(m_listener); @@ -59,7 +60,7 @@ protected void setPanel(JPanel panel) { m_panel = panel; - m_window.add(m_panel); + m_window.add(scrollPane); m_panel.addMouseListener(m_listener); } From b3eaedf3b23a64f8fac0e97963cafe4687768db0 Mon Sep 17 00:00:00 2001 From: "varsita.narayanasamy" Date: Mon, 20 Dec 2021 16:45:45 +1030 Subject: [PATCH 2/2] modified scrollpane to windows notifications panel --- .../notification/types/WindowNotification.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/notification/types/WindowNotification.java b/src/main/java/com/notification/types/WindowNotification.java index 4a58de6..d85cc00 100644 --- a/src/main/java/com/notification/types/WindowNotification.java +++ b/src/main/java/com/notification/types/WindowNotification.java @@ -51,8 +51,6 @@ protected JWindow getWindow() { } protected void setPanel(JPanel panel) { - JScrollPane scrollPane = new JScrollPane(panel); - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); if (m_panel != null) { m_window.remove(m_panel); m_panel.removeMouseListener(m_listener); @@ -60,10 +58,21 @@ protected void setPanel(JPanel panel) { m_panel = panel; - m_window.add(scrollPane); + m_window.add(m_panel); m_panel.addMouseListener(m_listener); } + public void setScrollBarToPanel() + { + if(m_panel != null) + { + m_window.remove(m_panel); + JScrollPane scrollPane = new JScrollPane(m_panel); + scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); + scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + m_window.add(scrollPane); + } + } /** * @return whether or not the Notification should close when it's clicked */