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

IDEA-158213 Inconsistent soft wraps all state

Browse Source
This commit is contained in:
Dmitry Batrak
2016-07-06 18:46:14 +03:00
parent bbed9b3f2d
commit 5b27be0ac3
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java
+2 -2
View File
@@ -71,9 +71,9 @@ public abstract class AbstractToggleUseSoftWrapsAction extends ToggleAction impl
@Override
public boolean isSelected(AnActionEvent e) {
if (myGlobal) return EditorSettingsExternalizable.getInstance().isUseSoftWraps(myAppliancePlace);
Editor editor = getEditor(e);
if (editor != null) return editor.getSettings().isUseSoftWraps();
else return myGlobal && EditorSettingsExternalizable.getInstance().isUseSoftWraps(myAppliancePlace);
return editor != null && editor.getSettings().isUseSoftWraps();
}
@Override
platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsInPreviewAction.java
+11
View File
@@ -15,10 +15,21 @@
*/
package com.intellij.openapi.editor.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces;
public class ToggleUseSoftWrapsInPreviewAction extends AbstractToggleUseSoftWrapsAction {
public ToggleUseSoftWrapsInPreviewAction() {
super(SoftWrapAppliancePlaces.PREVIEW, true);
}
@Override
public boolean isSelected(AnActionEvent e) {
Editor editor = getEditor(e);
return editor == null
? EditorSettingsExternalizable.getInstance().isUseSoftWraps(SoftWrapAppliancePlaces.PREVIEW)
: editor.getSettings().isUseSoftWraps();
}
}