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

NO_FONT_ITEM renamed to myNoFontItem (IDEA-CR-21585)

Browse Source
This commit is contained in:
Rustam Vishnyakov
2017-06-08 16:24:46 +03:00
parent 1c1b351c18
commit 3865e588a8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/FontComboBox.java
+8 -8
View File
@@ -90,14 +90,14 @@ public final class FontComboBox extends ComboBox {
}
private static final class Model extends AbstractListModel implements ComboBoxModel {
private final NoFontItem NO_FONT_ITEM;
private final NoFontItem myNoFontItem;
private volatile List<FontInfo> myAllFonts = Collections.emptyList();
private volatile List<FontInfo> myMonoFonts = Collections.emptyList();
private boolean myMonospacedOnly;
private Object mySelectedItem;
private Model(boolean withAllStyles, boolean filterNonLatin, boolean noFontItem) {
NO_FONT_ITEM = noFontItem ? new NoFontItem() : null;
myNoFontItem = noFontItem ? new NoFontItem() : null;
Application application = ApplicationManager.getApplication();
if (application == null || application.isUnitTestMode()) {
setFonts(FontInfo.getAll(withAllStyles), filterNonLatin);
@@ -141,8 +141,8 @@ public final class FontComboBox extends ComboBox {
@Override
public void setSelectedItem(@Nullable Object item) {
if (item == null && NO_FONT_ITEM != null) {
item = NO_FONT_ITEM;
if (item == null && myNoFontItem != null) {
item = myNoFontItem;
}
else {
if (item instanceof FontInfo) {
@@ -164,7 +164,7 @@ public final class FontComboBox extends ComboBox {
}
public boolean isNoFontSelected() {
return getSelectedItem() == NO_FONT_ITEM;
return getSelectedItem() == myNoFontItem;
}
@Override
@@ -172,15 +172,15 @@ public final class FontComboBox extends ComboBox {
List<FontInfo> list = myMonospacedOnly ? myMonoFonts : myAllFonts;
int size = list.size();
if (mySelectedItem instanceof String) size ++;
if (NO_FONT_ITEM != null) size++;
if (myNoFontItem != null) size++;
return size;
}
@Override
public Object getElementAt(int index) {
int i = index;
if (NO_FONT_ITEM != null) {
if (index == 0) return NO_FONT_ITEM;
if (myNoFontItem != null) {
if (index == 0) return myNoFontItem;
i --;
}
List<FontInfo> list = myMonospacedOnly ? myMonoFonts : myAllFonts;