summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdeline CARNIS <adeline.carnis@scilab-enterprises.com>2016-08-12 11:40:50 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-04 16:05:31 +0100
commitb87683f19085c0266aff368b4e3999527eea37b2 (patch)
tree80595653a884eec3cd45fbc1fbb5665eb45599b0
parentdbeeeadbede28e9c9ebfc2aeadeb38932b58ce15 (diff)
downloadscilab-b87683f19085c0266aff368b4e3999527eea37b2.zip
scilab-b87683f19085c0266aff368b4e3999527eea37b2.tar.gz
* Bug #14578 fixed - LaTeX string used for text uicontrol was not updated.
Change-Id: Idd5c5daf58e0f909ce43fd03983b1af6a3dba4e6
-rw-r--r--scilab/CHANGES.md1
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java1
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_14578.tst22
3 files changed, 24 insertions, 0 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 6dc5476..b4c8e4a 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -361,6 +361,7 @@ Bug Fixes
361* [#14553](http://bugzilla.scilab.org/show_bug.cgi?id=14553): find(a=b) crashed Scilab. 361* [#14553](http://bugzilla.scilab.org/show_bug.cgi?id=14553): find(a=b) crashed Scilab.
362* [#14557](http://bugzilla.scilab.org/show_bug.cgi?id=14557): `csim` failed when the system has no state. 362* [#14557](http://bugzilla.scilab.org/show_bug.cgi?id=14557): `csim` failed when the system has no state.
363* [#14564](http://bugzilla.scilab.org/show_bug.cgi?id=14564): fieldnames failed for empty structs. 363* [#14564](http://bugzilla.scilab.org/show_bug.cgi?id=14564): fieldnames failed for empty structs.
364* [#14578](http://bugzilla.scilab.org/show_bug.cgi?id=14578): LaTeX string used for text uicontrol was not updated.
364* [#14582](http://bugzilla.scilab.org/show_bug.cgi?id=14582): `gettext`or it alias `_()` were sometimes applied to broken literal strings 365* [#14582](http://bugzilla.scilab.org/show_bug.cgi?id=14582): `gettext`or it alias `_()` were sometimes applied to broken literal strings
365* [#14586](http://bugzilla.scilab.org/show_bug.cgi?id=14586): Xcos simulation stop button did not work. 366* [#14586](http://bugzilla.scilab.org/show_bug.cgi?id=14586): Xcos simulation stop button did not work.
366* [#14587](http://bugzilla.scilab.org/show_bug.cgi?id=14587): Datatip textbox wrong clipping when loaded from `*.scg` file. 367* [#14587](http://bugzilla.scilab.org/show_bug.cgi?id=14587): Datatip textbox wrong clipping when loaded from `*.scg` file.
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
index 4371dcb..8d247c6 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
@@ -772,6 +772,7 @@ public class SwingScilabLabel extends JScrollPane implements SwingViewObject, Wi
772 } 772 }
773 preferred = new Dimension(icon.getIconWidth(), icon.getIconHeight()); 773 preferred = new Dimension(icon.getIconWidth(), icon.getIconHeight());
774 revalidate(); 774 revalidate();
775 repaint();
775 } 776 }
776 } 777 }
777 778
diff --git a/scilab/modules/gui/tests/nonreg_tests/bug_14578.tst b/scilab/modules/gui/tests/nonreg_tests/bug_14578.tst
new file mode 100644
index 0000000..1279839
--- /dev/null
+++ b/scilab/modules/gui/tests/nonreg_tests/bug_14578.tst
@@ -0,0 +1,22 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2016 - Scilab Enterprises - Adeline CARNIS
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7//
8// <-- TEST WITH GRAPHIC -->
9// <-- INTERACTIVE TEST -->
10//
11// <-- Non-regression test for bug 14578 -->
12//
13// <-- Bugzilla URL -->
14// http://bugzilla.scilab.org/14578
15//
16// <-- Short Description -->
17// LaTeX string used for text uicontrol was not updated.
18
19f=figure();
20T=uicontrol("parent", f,"style","text","string","$\sqrt{x+1}$","position",[0,200,300,100]);
21T.string="$\sin(x+3)$";
22