opaque control

This commit is contained in:
Konstantin Bulenkov
2012-04-25 17:45:32 +02:00
parent d7fba55641
commit 0e9b27684f
2 changed files with 19 additions and 6 deletions
@@ -49,7 +49,6 @@ public abstract class ProjectViewTree extends DnDAwareTree {
cellRenderer.setIconOpaque(false);
setCellRenderer(cellRenderer);
cellRenderer.setTransparentIconBackground(true);
setOpaque(false);
}
public abstract DefaultMutableTreeNode getSelectedNode();
@@ -73,7 +72,14 @@ public abstract class ProjectViewTree extends DnDAwareTree {
@Override
public boolean isFileColorsEnabled() {
return FileColorManagerImpl._isEnabled() && FileColorManagerImpl._isEnabledForProjectView();
final boolean enabled = FileColorManagerImpl._isEnabled() && FileColorManagerImpl._isEnabledForProjectView();
final boolean opaque = isOpaque();
if (enabled && opaque) {
setOpaque(false);
} else if (!enabled && !opaque) {
setOpaque(true);
}
return enabled;
}
@Nullable
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -110,9 +110,16 @@ public abstract class ChangesTreeList<T> extends JPanel {
@Override
public boolean isFileColorsEnabled() {
return Registry.is("file.colors.in.commit.dialog")
&& FileColorManager.getInstance(project).isEnabled()
&& FileColorManager.getInstance(project).isEnabledForProjectView();
final boolean enabled = Registry.is("file.colors.in.commit.dialog")
&& FileColorManager.getInstance(project).isEnabled()
&& FileColorManager.getInstance(project).isEnabledForProjectView();
final boolean opaque = isOpaque();
if (enabled && opaque) {
setOpaque(false);
} else if (!enabled && !opaque) {
setOpaque(true);
}
return enabled;
}
@Override