MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Let user accept 'User License Agreement' when it's been fully scrolled

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-12-13 20:46:56 +03:00
parent 480999a761
commit 9c7ea87dad
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+18 -5
View File
@@ -43,9 +43,7 @@ import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.util.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.ImageUtil;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.SwingHelper;
import com.intellij.util.ui.*;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -56,6 +54,8 @@ import javax.swing.event.HyperlinkEvent;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.StyleSheet;
import java.awt.*;
import java.awt.event.AdjustmentEvent;
import java.awt.event.AdjustmentListener;
import java.io.File;
import java.io.InputStream;
import java.net.URL;
@@ -313,7 +313,19 @@ public class AppUIUtil {
viewer.setCaretPosition(0);
viewer.setBorder(JBUI.Borders.empty(0, 5, 5, 5));
centerPanel.add(new JLabel("Please read and accept these terms and conditions:"), BorderLayout.NORTH);
centerPanel.add(new JBScrollPane(viewer, VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
JBScrollPane myMyScrollPane = new JBScrollPane(viewer, VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_NEVER);
final JScrollBar scrollBar = myMyScrollPane.getVerticalScrollBar();
scrollBar.addAdjustmentListener(new AdjustmentListener() {
boolean wasScrolledToTheBottom = false;
@Override
public void adjustmentValueChanged(AdjustmentEvent e) {
if (!wasScrolledToTheBottom) {
wasScrolledToTheBottom = UIUtil.isScrolledToTheBottom(viewer);
}
setOKActionEnabled(wasScrolledToTheBottom);
}
});
centerPanel.add(myMyScrollPane, BorderLayout.CENTER);
return centerPanel;
}
@@ -322,6 +334,7 @@ public class AppUIUtil {
super.createDefaultActions();
init();
setOKButtonText("Accept");
setOKActionEnabled(false);
setCancelButtonText("Reject and Exit");
setAutoAdjustable(false);
}
@@ -339,7 +352,7 @@ public class AppUIUtil {
}
};
dialog.setModal(true);
dialog.setTitle(ApplicationNamesInfo.getInstance().getFullProductName() + " Privacy Policy Agreement");
dialog.setTitle(ApplicationNamesInfo.getInstance().getFullProductName() + " User Licence Agreement");
dialog.setSize(JBUI.scale(509), JBUI.scale(395));
dialog.show();
}
platform/util/src/com/intellij/util/ui/UIUtil.java
+7
View File
@@ -223,6 +223,13 @@ public class UIUtil {
return Font.DIALOG.equals(font.getFamily(Locale.US));
}
public static boolean isScrolledToTheBottom(JComponent c) {
JScrollPane scrollPane = c != null ? getParentOfType(JScrollPane.class, c) : null;
if (scrollPane == null) return true;
Rectangle viewRect = scrollPane.getViewport().getViewRect();
return (c.getHeight() == viewRect.y + viewRect.height);
}
public enum FontSize {NORMAL, SMALL, MINI}
public enum ComponentStyle {LARGE, REGULAR, SMALL, MINI}