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

Move quick doc font size from color scheme to IDE properties (for IDEA-152590: Quick doc font size is not remembered between IDE restarts)

Browse Source
This commit is contained in:
Rustam Vishnyakov
2016-06-18 14:02:52 +03:00
parent 15cc489dc5
commit 4e7d695a1c
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java
+3
View File
@@ -70,7 +70,10 @@ public interface EditorColorsScheme extends Cloneable, TextAttributesScheme, Sch
*/
void setEditorFontSize(int fontSize);
@Deprecated
FontSize getQuickDocFontSize();
@Deprecated
void setQuickDocFontSize(@NotNull FontSize fontSize);
Font getFont(EditorFontType key);
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
+27 -12
View File
@@ -24,6 +24,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
import com.intellij.ide.actions.BaseNavigateToSourceAction;
import com.intellij.ide.actions.ExternalJavaDocAction;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.lang.documentation.DocumentationProvider;
import com.intellij.lang.documentation.ExternalDocumentationProvider;
import com.intellij.openapi.Disposable;
@@ -96,6 +97,8 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
private SmartPsiElementPointer myElement;
private long myModificationCount;
private static final String QUICK_DOC_FONT_SIZE_PROPERTY = "quick.doc.font.size";
private final Stack<Context> myBackStack = new Stack<Context>();
private final Stack<Context> myForwardStack = new Stack<Context>();
private final ActionToolbar myToolBar;
@@ -267,9 +270,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
int change = Math.abs(e.getWheelRotation());
boolean increase = e.getWheelRotation() <= 0;
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
EditorColorsScheme scheme = colorsManager.getGlobalScheme();
FontSize newFontSize = scheme.getQuickDocFontSize();
FontSize newFontSize = getQuickDocFontSize();
for (; change > 0; change--) {
if (increase) {
newFontSize = newFontSize.larger();
@@ -279,11 +280,11 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
}
}
if (newFontSize == scheme.getQuickDocFontSize()) {
if (newFontSize == getQuickDocFontSize()) {
return;
}
scheme.setQuickDocFontSize(newFontSize);
setQuickDocFontSize(newFontSize);
applyFontSize();
setFontSizeSliderSize(newFontSize);
}
@@ -483,9 +484,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
if (myIgnoreFontSizeSliderChange) {
return;
}
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
EditorColorsScheme scheme = colorsManager.getGlobalScheme();
scheme.setQuickDocFontSize(FontSize.values()[myFontSizeSlider.getValue()]);
setQuickDocFontSize(FontSize.values()[myFontSizeSlider.getValue()]);
applyFontSize();
}
});
@@ -499,6 +498,24 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
return result;
}
@NotNull
public static FontSize getQuickDocFontSize() {
String strValue = PropertiesComponent.getInstance().getValue(QUICK_DOC_FONT_SIZE_PROPERTY);
if (strValue != null) {
try {
return FontSize.valueOf(strValue);
}
catch (IllegalArgumentException iae) {
// ignore, fall back to default font.
}
}
return FontSize.SMALL;
}
public void setQuickDocFontSize(@NotNull FontSize fontSize) {
PropertiesComponent.getInstance().setValue(QUICK_DOC_FONT_SIZE_PROPERTY, fontSize.toString());
}
private void setFontSizeSliderSize(FontSize fontSize) {
myIgnoreFontSizeSliderChange = true;
try {
@@ -659,7 +676,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
EditorColorsScheme scheme = colorsManager.getGlobalScheme();
StyleConstants.setFontSize(myFontSizeStyle, JBUI.scale(scheme.getQuickDocFontSize().getSize()));
StyleConstants.setFontSize(myFontSizeStyle, JBUI.scale(getQuickDocFontSize().getSize()));
if (Registry.is("documentation.component.editor.font")) {
StyleConstants.setFontFamily(myFontSizeStyle, scheme.getEditorFontName());
}
@@ -1013,9 +1030,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
return;
}
EditorColorsManager colorsManager = EditorColorsManager.getInstance();
EditorColorsScheme scheme = colorsManager.getGlobalScheme();
setFontSizeSliderSize(scheme.getQuickDocFontSize());
setFontSizeSliderSize(getQuickDocFontSize());
mySettingsPanel.setVisible(true);
}
}