Merge pull request #140 from hellokent/master

调整若干 UI 细节

Author: shuzijun

.gitignore

@@ -24,4 +24,117 @@ hs_err_pid*
 /*.iml
 .idea/
 /build/
-/out/
+/out/
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Gradle template
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+

src/main/java/com/shuzijun/leetcode/plugin/actions/editor/TestcaseAction.java

@@ -27,7 +27,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config, Question
         dialog.setTitle(question.getFormTitle() + " Testcase");
         dialog.setText(question.getTestCase());
         if (dialog.showAndGet()) {
-            String text = dialog.testcaeText();
+            String text = dialog.testcaseText();
             if (StringUtils.isBlank(text)) {
                 MessageUtils.getInstance(anActionEvent.getProject()).showWarnMsg("info", PropertiesUtils.getInfo("test.case"));
                 return;

src/main/java/com/shuzijun/leetcode/plugin/actions/tree/TestcaseAction.java

@@ -29,7 +29,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Config config, JTree tr
         dialog.setTitle(question.getFormTitle() + " Testcase");
         dialog.setText(question.getTestCase());
         if (dialog.showAndGet()) {
-            String text = dialog.testcaeText();
+            String text = dialog.testcaseText();
             if (StringUtils.isBlank(text)) {
                 MessageUtils.getInstance(anActionEvent.getProject()).showWarnMsg("info", PropertiesUtils.getInfo("test.case"));
                 return;

src/main/java/com/shuzijun/leetcode/plugin/listener/QueryKeyListener.java

@@ -80,14 +80,15 @@ public void keyPressed(KeyEvent e) {
                 }
                 DefaultMutableTreeNode temp = (DefaultMutableTreeNode) all.getChildAt(i);
                 if (temp.getUserObject().toString().toUpperCase().replace(" ","").contains(selectText.toUpperCase().replace(" ",""))) {
-                    tree.setSelectionPath(new TreePath(temp.getPath()));
-                    Point point = new Point(0, i < 3 ? 0 : (i - 3) * tree.getRowHeight());
+                    TreePath toShowPath = new TreePath(temp.getPath());
+                    tree.setSelectionPath(toShowPath);
+                    Rectangle bounds = tree.getPathBounds(toShowPath);
+                    Point point = new Point(0, (int) bounds.getY());
                     viewport.setViewPosition(point);
                     return;
                 }
             }
             MessageUtils.showMsg(toolWindow.getContentManager().getComponent(), MessageType.INFO, "info", "not find next");
-            return;
         }
     }
 

src/main/java/com/shuzijun/leetcode/plugin/window/NavigatorPanel.java

@@ -89,7 +89,7 @@ protected void paintComponent(Graphics g) {
             }
         };
         tree.getEmptyText().clear();
-        tree.setRowHeight(21);
+        //tree.setRowHeight(21);
         tree.setOpaque(false);
         tree.setCellRenderer(new CustomTreeCellRenderer());
         tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);

src/main/java/com/shuzijun/leetcode/plugin/window/TestcasePanel.java

@@ -22,11 +22,11 @@ public class TestcasePanel extends DialogWrapper {
     public TestcasePanel(@Nullable Project project) {
         super(project, true);
         jpanel = new JBPanel();
+        jpanel.setLayout(new BorderLayout());
         caseText = new JTextArea();
         caseText.setMinimumSize(new Dimension(400, 200));
         caseText.setPreferredSize(new Dimension(400, 200));
-        jpanel.add(new JBScrollPane(caseText, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
-
+        jpanel.add(new JBScrollPane(caseText, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JBScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER);
         setModal(true);
         init();
     }
@@ -45,7 +45,7 @@ protected Action getOKAction() {
         return action;
     }
 
-    public String testcaeText() {
+    public String testcaseText() {
         return caseText.getText();
     }