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

MacBook touch bar: remove errors logging

Browse Source 
because plugins can replace editor-headers so that components don't contain action group for touchbar

fixed EA-124125 - assert: ProjectData.findEditorDataByComponent
fixed EA-124353 - assert: TouchBar.createItem
This commit is contained in:
Artem Bochkarev
2018-07-16 13:26:07 +07:00
parent 2c580d4996
commit 5dd2b0eb88
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java
+1 -1
View File
@@ -148,7 +148,7 @@ class ProjectData {
if (child == ecmp || SwingUtilities.isDescendingFrom(child, ecmp)) {
// System.out.println("focused header: " + ecmp);
if (editorData.containerSearch == null) {
LOG.error("focused header of editor: " + editorData.editor + ", but BarContainer wasn't created, header: " + ecmp);
// System.out.println("focused header of editor '" + editorData.editor + "', but BarContainer wasn't created (seems that ui-component doesn't contain actions for touchbar), header: " + ecmp);
continue;
}
return editorData;
platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemAnActionButton.java
+1 -4
View File
@@ -20,8 +20,6 @@ import java.awt.event.KeyEvent;
import static java.awt.event.ComponentEvent.COMPONENT_FIRST;
class TBItemAnActionButton extends TBItemButton {
private static final boolean LOG_ICON_ERRORS = System.getProperty("touchbar.log.icon.errors", "false").equals("true");
public static final int SHOWMODE_IMAGE_ONLY = 0;
public static final int SHOWMODE_TEXT_ONLY = 1;
public static final int SHOWMODE_IMAGE_TEXT = 2;
@@ -113,8 +111,7 @@ class TBItemAnActionButton extends TBItemButton {
if (icon == null)
icon = IconLoader.getDisabledIcon(presentation.getIcon());
}
if (icon == null && LOG_ICON_ERRORS)
LOG.error("can't get icon, action " + myActionId + ", presentation = " + _printPresentation(presentation));
// if (icon == null) System.out.println("WARN: can't obtain icon, action " + myActionId + ", presentation = " + _printPresentation(presentation));
}
boolean isSelected = false;