From e76a298cafbce8058fb622cf883b3926d46e01f6 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Sat, 8 Nov 2014 00:17:03 +0300 Subject: [PATCH] EditorImpl: editor-based cell renderer performance & setFontPreferences() fix --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index 57ee778aaf99..e978b1e8c974 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -6075,6 +6075,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi public void setEditorFontSize(int fontSize) { if (fontSize < MIN_FONT_SIZE) fontSize = MIN_FONT_SIZE; if (fontSize > myMaxFontSize) fontSize = myMaxFontSize; + if (fontSize == myFontSize) return; myFontSize = fontSize; initFonts(); } @@ -6087,8 +6088,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi @Override public void setFontPreferences(@NotNull FontPreferences preferences) { + if (Comparing.equal(preferences, myFontPreferences)) return; preferences.copyTo(myFontPreferences); - initFonts(); + reinitSettings(); } @Override @@ -6101,6 +6103,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi @Override public void setEditorFontName(String fontName) { + if (Comparing.equal(fontName, myFaceName)) return; myFaceName = fontName; initFonts(); }