Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9111] trunk/framework/ebli-2d/src/main/java/org/fudaa/ ebli/calque/BArbreCalque.java
|
From: <bma...@us...> - 2015-04-20 09:08:23
|
Revision: 9111
http://sourceforge.net/p/fudaa/svn/9111
Author: bmarchan
Date: 2015-04-20 09:08:21 +0000 (Mon, 20 Apr 2015)
Log Message:
-----------
Gestion correcte L&F Nimbus pour l'arbre des calques
Modified Paths:
--------------
trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
Modified: trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java
===================================================================
--- trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java 2015-04-17 13:48:00 UTC (rev 9110)
+++ trunk/framework/ebli-2d/src/main/java/org/fudaa/ebli/calque/BArbreCalque.java 2015-04-20 09:08:21 UTC (rev 9111)
@@ -539,6 +539,7 @@
public ArbreCell1(final boolean _editable) {
r1_ = new BuTextField();
r1_.setEditable(false);
+ r1_.setOpaque(false);
r1_.setBorder(null);
r2_ = new JLabel(" ");
r2_.setPreferredSize(new Dimension(80, 12));
@@ -562,6 +563,7 @@
pnRight_.setLayout(new BuBorderLayout(2, 1, true, true));
pnRight_.add(r3_, BuBorderLayout.CENTER);
pnRight_.add(r4, BuBorderLayout.EAST);
+ pnRight_.setOpaque(false);
if (_editable) {
cbVisible_ = new BuCheckBox3States();
@@ -577,9 +579,10 @@
pnLeft.add(lbSelect_);
add(pnLeft, BuBorderLayout.WEST);
add(pnRight_, BuBorderLayout.CENTER);
- setOpaque(true);
+ // B.M. : Supprim\xE9 pour le L&F Nimbus
+// setOpaque(true);
}
- final BuLightBorder light_ = new BuLightBorder(BuLightBorder.RAISED, 3);
+ final BuLightBorder light_ = new BuLightBorder(BuLightBorder.RAISED, 1);
@Override
public Component getTreeCellRendererComponent(final JTree _tree, final Object _value, final boolean _selected,
@@ -666,32 +669,30 @@
}
}
r2_.setText(s.toString());
- setBackground(treeBackground_);
- setForeground(treeForeground_);
if (_selected) {
final Color bg = treeSelectionBakground_;
final Color fg = treeSelectionForeground_;
- pnRight_.setBackground(bg);
- pnRight_.setForeground(fg);
+ setBackground(bg);
+ setForeground(fg);
r1_.setBackground(bg);
r1_.setForeground(fg);
- r2_.setBackground(bg);
r2_.setForeground(fg);
- r3_.setBackground(bg);
r3_.setForeground(fg);
- pnRight_.setBorder(light_);
+ // B.M. : Opacit\xE9 necessaire pour le L&F Nimbus qui ne semble pas gerer correctement le treeBackground_
+ setOpaque(true);
+ r1_.setOpaque(true);
} else {
final Color bg = treeBackground_;
final Color fg = treeForeground_;
- pnRight_.setBackground(bg);
- pnRight_.setForeground(fg);
+ setBackground(bg);
+ setForeground(fg);
r1_.setBackground(bg);
r1_.setForeground(fg);
- r2_.setBackground(bg);
r2_.setForeground(fg);
- r3_.setBackground(bg);
r3_.setForeground(fg);
- pnRight_.setBorder(BuBorders.EMPTY3333);
+ // B.M. : Opacit\xE9 necessaire pour le L&F Nimbus qui ne semble pas gerer correctement le treeBackground_
+ setOpaque(false);
+ r1_.setOpaque(false);
}
final StringBuffer tooltip = new StringBuffer(60);
tooltip.append("<html><body style=\"margin:1px;\">");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
