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

IDEA-185543 add horizontal scrollbar if list does not fit a screen

Browse Source
This commit is contained in:
Sergey Malenkov
2018-03-13 12:16:26 +03:00
parent e357d25feb
commit c51b307112
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNamePopup.java
+15 -1
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.ui.popup.ComponentPopupBuilder;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.statistics.StatisticsInfo;
@@ -127,6 +128,9 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
protected void showList() {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
ListModel<Object> model = myList.getModel();
if (model == null || model.getSize() == 0) return;
final JLayeredPane layeredPane = myTextField.getRootPane().getLayeredPane();
Point location = layeredPane.getLocationOnScreen();
@@ -147,7 +151,16 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
screen.width -= location.x - screen.x;
screen.height -= location.y - screen.y;
if (preferredScrollPaneSize.width > screen.width) preferredScrollPaneSize.width = screen.width;
if (preferredScrollPaneSize.width > screen.width) {
preferredScrollPaneSize.width = screen.width;
if (model.getSize() <= myList.getVisibleRowCount()) {
JScrollBar hsb = myListScrollPane.getHorizontalScrollBar();
if (hsb != null && (!SystemInfo.isMac || hsb.isOpaque())) {
Dimension size = hsb.getPreferredSize();
if (size != null) preferredScrollPaneSize.height += size.height;
}
}
}
if (preferredScrollPaneSize.height > screen.height) preferredScrollPaneSize.height = screen.height;
String adText = getAdText();
@@ -164,6 +177,7 @@ public class ChooseByNamePopup extends ChooseByNameBase implements ChooseByNameP
.setMayBeParent(true);
builder.setCancelCallback(() -> Boolean.TRUE);
myDropdownPopup = builder.createPopup();
myDropdownPopup.setSize(preferredScrollPaneSize);
myDropdownPopup.showInScreenCoordinates(layeredPane, location);
}
else {