* Bug #11479 fixed - Under Ubuntu Unity, the color of the text menu was wrong.

Change-Id: If3fd2fd158fec8f4088790dfe40b368114716ad2

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 46004d8..f92083b 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -58,6 +58,8 @@ Bug fixes
 * Bug #11343 fixed - The "isoview" figure property did not work when the axes
                      margins had been modified.
 
+* Bug #11479 fixed - Under Ubuntu Unity, the color of the text menu was wrong.
+
 * Bug #12163 fixed - unzoom did not work with a single input argument.
 
 * Bug #12463 fixed - Bad specification for rect=[x,y,w,h] argument in french help

diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java
index a65e64d..eaaa5a8 100644 (file)
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingViewMenu.java
@@ -26,6 +26,7 @@ import static org.scilab.modules.graphic_objects.graphicObject.GraphicObjectProp
 import java.awt.Color;
 
 import javax.swing.ImageIcon;
+import javax.swing.UIManager;
 
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.graphic_objects.graphicController.GraphicController;
@@ -79,10 +80,7 @@ public final class SwingViewMenu {
             uimenu.setVisible((Boolean) value);
             break;
         case __GO_UI_FOREGROUNDCOLOR__ :
-            Double[] allColors = ((Double[]) value);
-            uimenu.setForeground(new Color((int) (allColors[0] * COLORS_COEFF),
-                                           (int) (allColors[1] * COLORS_COEFF),
-                                           (int) (allColors[2] * COLORS_COEFF)));
+            uimenu.setForeground(UIManager.getColor("MenuBar.foreground"));
             break;
         case __GO_UI_ICON__ :
             if (!((String) value).equals("")) {