From c3bfb2899804b4f229f30e35670f8c43285c9a43 Mon Sep 17 00:00:00 2001
From: Samuel GOUGEON <sgougeon@free.fr>
Date: Sun, 31 Jan 2021 02:06:44 +0100
Subject: [PATCH] * Bug 16638 fixed: getcolor() rendering debugged

  http://bugzilla.scilab.org/16638
  Page illustrated: http://bugzilla.scilab.org/attachment.cgi?id=5226

Change-Id: I4235ec23407d3df5b87ac61f35e32f3d345c4fc7
---
 scilab/CHANGES.md                                  |    7 +-
 .../help/en_US/color_management/getcolor.xml       |   54 ++++++---
 scilab/modules/graphics/help/images/getcolor.png   |  Bin 0 -> 6483 bytes
 .../help/ja_JP/color_management/getcolor.xml       |  122 +++++---------------
 .../help/pt_BR/color_management/getcolor.xml       |   57 ++++++---
 .../help/ru_RU/color_management/getcolor.xml       |  114 ++++++++++++++++++
 scilab/modules/graphics/macros/getcolor.sci        |   50 ++++----
 scilab/modules/helptools/images/getcolor.png       |  Bin 0 -> 6483 bytes
 8 files changed, 256 insertions(+), 148 deletions(-)
 create mode 100644 scilab/modules/graphics/help/images/getcolor.png
 create mode 100644 scilab/modules/graphics/help/ru_RU/color_management/getcolor.xml
 create mode 100644 scilab/modules/helptools/images/getcolor.png

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 08399fc..960105c 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -201,7 +201,6 @@ Feature changes and additions on 6.1.1
   - It can now sort any sparse 2D matrix, in all `g, r, c, lr, lc` methods, including sparse booleans and in multi-level mode. It was formerly limited to sparse real or complex vectors and only to the `g` mode.
   - Any hypermatrix can be sorted along a dimension > 2.
 * `unique` is enabled for any 2D sparse arrays, in simple, 'c' and 'r' modes.
-<<<<<<< HEAD
 * `%chars` constant added, to easily access to some selected sets of unicode symbols.
 * Lists are displayed in a more compact and comprehensive way.
 * `interp1` is upgraded:
@@ -226,11 +225,8 @@ Feature changes and additions on 6.1.1
 * `close` is extended to close the help browser, xcos, or the variables browser or editor GUIs.
 * `polyint` is introduced to compute polynomial antiderivatives.
 * Listbox uicontrol callback is now triggered by item click in single selection mode. For example, it allows successive execution of a demo in the demonstrations gui.
-
-=======
-* %chars constant added, to easily access to some selected sets of unicode symbols.
 * `det` is now actually extended to sparse matrices.
->>>>>>> 608020c6bbd (* Bug 16636 fixed: det(sparse) now actually implemented)
+
 
 Help pages:
 -----------
@@ -434,6 +430,7 @@ Bug Fixes
 * [#16631](https://bugzilla.scilab.org/16631): read-only handle properties were reported as unknown when trying to set them.
 * [#16632](https://bugzilla.scilab.org/16632): Scilab did not start with unsupported locale on macOS.
 * [#16636](https://bugzilla.scilab.org/16636): `det(sparse)` most often yielded `Nan`. `[e,m]=det(sparse)` was not actually implemented.
+* [#16638](https://bugzilla.scilab.org/16638): `getcolor` shew a bunch of issues.
 * [#16644](https://bugzilla.scilab.org/16644): `input("message:")` yielded a wrong error message about `mprintf` in case of non-interpretable input.
 * [#16654](https://bugzilla.scilab.org/16654): `interp` was leaking memory.
 
diff --git a/scilab/modules/graphics/help/en_US/color_management/getcolor.xml b/scilab/modules/graphics/help/en_US/color_management/getcolor.xml
index e36aaf6..023ab48 100644
--- a/scilab/modules/graphics/help/en_US/color_management/getcolor.xml
+++ b/scilab/modules/graphics/help/en_US/color_management/getcolor.xml
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2021 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -13,15 +13,20 @@
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"  xml:lang="en" xml:id="getcolor">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="en" xml:id="getcolor">
     <refnamediv>
         <refname>getcolor</refname>
-        <refpurpose>opens a dialog to show colors in the current colormap</refpurpose>
+        <refpurpose>opens a dialog to show colors of the current or default colormap</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>c=getcolor(title,[cini])
-            c=getcolor()
+        <synopsis>
+            c = getcolor()
+            c = getcolor(title)
+            c = getcolor(title, cini)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -36,13 +41,13 @@
             <varlistentry>
                 <term>cini</term>
                 <listitem>
-                    <para>initial selected color id. Default value is 1.</para>
+                    <para>initial selected color index. Default value is 1.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>c</term>
                 <listitem>
-                    <para>selected color id or [] if the selection is cancelled.</para>
+                    <para>index of the selected color, or [] if the selection is canceled.</para>
                 </listitem>
             </varlistentry>
         </variablelist>
@@ -50,26 +55,47 @@
     <refsection>
         <title>Description</title>
         <para>
-            <literal>getcolor</literal> opens a window displaying the palette of the current colormap.
-            The user can click on a color to show its id and RGB values.
-            <literal>getcolor</literal> returns the id of the selected color or [] if the "Cancel" button has been clicked or the window closed.
+            <literal>getcolor</literal> opens a window displaying the palette of the current
+            colormap, or of the default one if no graphical figure exists.
+            The user can click on a color to show its index and its RGB values
+            in the bottom bar.
+            <literal>getcolor</literal> returns the index of the selected color, or [] if the "Cancel"
+            button has been clicked or the window has been closed.
         </para>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
-getcolor();
+c = getcolor();
 
-getcolor("Title foo");
+c = getcolor("Title foo", color("red")); // preselects the red
 
-getcolor("foo",21); // Select the red
- ]]></programlisting>
+c = getcolor("Please choose a color");
+     ]]></programlisting>
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../images/getcolor.png"/>
+            </imageobject>
+        </inlinemediaobject>
+        <para/>
+        <screen><![CDATA[
+--> c = getcolor("Please choose a color")
+ c  =
+   28.
+]]></screen>
     </refsection>
 
     <refsection role="see also">
         <title>See also</title>
         <simplelist type="inline">
             <member>
+                <link linkend="uigetcolor">uigetcolor</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
                 <link linkend="color">color</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/images/getcolor.png b/scilab/modules/graphics/help/images/getcolor.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b82ef7fbdd58c6343fdbe6597d84f911846487
GIT binary patch
literal 6483
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

literal 0
HcmV?d00001

diff --git a/scilab/modules/graphics/help/ja_JP/color_management/getcolor.xml b/scilab/modules/graphics/help/ja_JP/color_management/getcolor.xml
index 79b03ae..4187203 100644
--- a/scilab/modules/graphics/help/ja_JP/color_management/getcolor.xml
+++ b/scilab/modules/graphics/help/ja_JP/color_management/getcolor.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
  * Copyright (C) INRIA
-
- *
-
-
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2021 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -17,146 +11,94 @@
  * and continues to be available under such terms.
  * For more information, see the COPYING file which you should have received
  * along with this program.
-
  *
-
  -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="getcolor">
-
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ja" xml:id="getcolor">
     <refnamediv>
-
         <refname>getcolor</refname>
-
         <refpurpose>カレントのカラーマップの色を示すダイアログをオープンする</refpurpose>
-
     </refnamediv>
-
     <refsynopsisdiv>
-
         <title>呼び出し手順</title>
-
-        <synopsis>c=getcolor(title,[cini])
-
-            c=getcolor()
-
+        <synopsis>
+            c = getcolor()
+            c = getcolor(title)
+            c = getcolor(title, cini)
         </synopsis>
-
     </refsynopsisdiv>
-
     <refsection>
-
         <title>引数</title>
-
         <variablelist>
-
             <varlistentry>
-
                 <term>title</term>
-
                 <listitem>
-
                     <para>文字列, ダイアログのタイトル.</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>cini</term>
-
                 <listitem>
-
                     <para>選択された初期値の色ID.デフォルト値はs 1.</para>
-
                 </listitem>
-
             </varlistentry>
-
             <varlistentry>
-
                 <term>c</term>
-
                 <listitem>
-
                     <para>選択された色IDまたは
-
                         選択がキャンセルされた場合に [].
-
                     </para>
-
                 </listitem>
-
             </varlistentry>
-
         </variablelist>
-
     </refsection>
-
     <refsection>
-
         <title>説明</title>
-
         <para>
-
             <literal>getcolor</literal> はカレントのカラーマップのパレットを表示する
-
             ウインドウをオープンします.
-
             ユーザはそのIDとRGB値を表示するために色をクリックすることができます.
-
             <literal>getcolor</literal> は選択された色のID,または
-
             "Cancel"ボタンがクリックされたかウインドウがクローズされた場合に []を返します.
-
         </para>
-
     </refsection>
-
     <refsection>
-
         <title>例</title>
-
         <programlisting role="example"><![CDATA[
-
-getcolor();
-
-
-
-getcolor("Title foo");
-
-
-
-getcolor("foo",21); // 赤を選択
-
- ]]></programlisting>
-
+c = getcolor();
+c = getcolor("Title foo", color("red")); // 赤を選択
+c = getcolor("Please choose a color");
+     ]]></programlisting>
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../images/getcolor.png"/>
+            </imageobject>
+        </inlinemediaobject>
+        <para/>
+        <screen><![CDATA[
+--> c = getcolor("Please choose a color")
+ c  =
+   28.
+]]></screen>
     </refsection>
-
-
-
     <refsection role="see also">
-
         <title>参照</title>
-
         <simplelist type="inline">
-
             <member>
-
+                <link linkend="uigetcolor">uigetcolor</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
                 <link linkend="color">color</link>
-
             </member>
-
             <member>
-
                 <link linkend="colormap">colormap</link>
-
             </member>
-
         </simplelist>
-
     </refsection>
-
-</refentry>
-
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/graphics/help/pt_BR/color_management/getcolor.xml b/scilab/modules/graphics/help/pt_BR/color_management/getcolor.xml
index c9da43a..317005a 100644
--- a/scilab/modules/graphics/help/pt_BR/color_management/getcolor.xml
+++ b/scilab/modules/graphics/help/pt_BR/color_management/getcolor.xml
@@ -2,8 +2,8 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA
- *
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2021 - Samuel GOUGEON
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -13,17 +13,22 @@
  * along with this program.
  *
  -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="getcolor" xml:lang="pt">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
+          xmlns:scilab="http://www.scilab.org" xml:id="getcolor" xml:lang="pt">
     <refnamediv>
         <refname>getcolor</refname>
-        <refpurpose>abre um diálogo que exibe as cores no mapa de cores
+        <refpurpose>abre um diálogo que exibe as cores no mapa de cores atual ou padrão
             corrente
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Seqüência de Chamamento</title>
-        <synopsis>c=getcolor(title,[cini])
-            c=getcolor()
+        <synopsis>
+            c = getcolor()
+            c = getcolor(title)
+            c = getcolor(title, cini)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
@@ -38,15 +43,14 @@
             <varlistentry>
                 <term>cini</term>
                 <listitem>
-                    <para>identificador da cor selecionada inicial. O valor padrão é
-                        1.
+                    <para>número da cor selecionada inicial. O valor padrão é 1.
                     </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term>c</term>
                 <listitem>
-                    <para>identificador da cor selecionada ou [] se o usuário tiver
+                    <para>número da cor selecionada, ou [] se o usuário tiver
                         clicado no botão "Cancel" (cancelar).
                     </para>
                 </listitem>
@@ -56,17 +60,44 @@
     <refsection>
         <title>Descrição</title>
         <para>
-            <literal>getcolor</literal> abre uma janela que exibe o palete do
-            mapa de cores corrente. O usuário pode clicar numa cor para exibir seu
-            identificador e valores RGB. <literal>getcolor</literal> retorna o
-            identificador da cor selecionada ou [] se o usuário clicar no botão
-            "Cancel".
+            <literal>getcolor</literal> abre uma janela que exibe o palete do mapa
+            de cores corrente o padrão. O usuário pode clicar numa cor para exibir seu
+            número e valores RGB. <literal>getcolor</literal> retorna o
+            número da cor selecionada, ou [] se o usuário clicar no botão "Cancel".
         </para>
     </refsection>
+    <refsection>
+        <title>Exemplos</title>
+        <programlisting role="example"><![CDATA[
+c = getcolor();
+
+c = getcolor("Title foo", color("red")); // preselects the red
+
+c = getcolor("Please choose a color");
+     ]]></programlisting>
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../images/getcolor.png"/>
+            </imageobject>
+        </inlinemediaobject>
+        <para/>
+        <screen><![CDATA[
+--> c = getcolor("Please choose a color")
+ c  =
+   28.
+]]></screen>
+    </refsection>
     <refsection role="see also">
         <title>Ver Também</title>
         <simplelist type="inline">
             <member>
+                <link linkend="uigetcolor">uigetcolor</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
                 <link linkend="color">color</link>
             </member>
             <member>
diff --git a/scilab/modules/graphics/help/ru_RU/color_management/getcolor.xml b/scilab/modules/graphics/help/ru_RU/color_management/getcolor.xml
new file mode 100644
index 0000000..18319c6
--- /dev/null
+++ b/scilab/modules/graphics/help/ru_RU/color_management/getcolor.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) INRIA
+ * Copyright (C) 2012 - 2016 - Scilab Enterprises
+ * Copyright (C) 2021 - Samuel GOUGEON
+ *
+ * This file is hereby licensed under the terms of the GNU GPL v2.0,
+ * pursuant to article 5.3.4 of the CeCILL v.2.1.
+ * This file was originally licensed under the terms of the CeCILL v2.1,
+ * and continues to be available under such terms.
+ * For more information, see the COPYING file which you should have received
+ * along with this program.
+ *
+ -->
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
+          xml:lang="ru" xml:id="getcolor">
+    <refnamediv>
+        <refname>getcolor</refname>
+        <refpurpose>
+            открывает диалог для показа цветов текущей цветовой карты или цветовой
+            карты по умолчанию
+        </refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Синтаксис</title>
+        <synopsis>
+            c = getcolor()
+            c = getcolor(title)
+            c = getcolor(title, cini)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Аргументы</title>
+        <variablelist>
+            <varlistentry>
+                <term>title</term>
+                <listitem>
+                    <para>строка, название диалога.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>cini</term>
+                <listitem>
+                    <para>
+                        индекс исходного выбранного цвета. Значению по умолчанию 1.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>c</term>
+                <listitem>
+                    <para>
+                        индекс выбранного цвета или <literal>[]</literal>, если
+                        выбор отменён.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Описание</title>
+        <para>
+            <literal>getcolor</literal> открывает окно, отображающее палитру текущей
+            цветовой карты, либо цветовой карты по умолчанию, если не существует
+            графического окна. Пользователь может щёлкнуть по цвету чтобы показать
+            его индекс и его RGB-значения на панели снизу.
+            <literal>getcolor</literal> возвращает индекс выбранного цвета, либо
+            <literal>[]</literal>, если выбор нажата кнопка "Отмена", либо окно
+            было закрыто.
+        </para>
+    </refsection>
+    <refsection>
+        <title>Примеры</title>
+        <programlisting role="example"><![CDATA[
+c = getcolor();
+
+c = getcolor("Title foo", color("red")); // предварительно выбран красный
+
+c = getcolor("Пожалуйста, выберите цвет");
+     ]]></programlisting>
+        <para/>
+        <inlinemediaobject>
+            <imageobject>
+                <imagedata fileref="../../images/getcolor.png"/>
+            </imageobject>
+        </inlinemediaobject>
+        <para/>
+        <screen><![CDATA[
+--> c = getcolor("Please choose a color")
+ c  =
+   28.
+]]></screen>
+    </refsection>
+
+    <refsection role="see also">
+        <title>Смотрите также</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="uigetcolor">uigetcolor</link>
+            </member>
+            <member>
+                <link linkend="color_list">color_list</link>
+            </member>
+            <member>
+                <link linkend="color">color</link>
+            </member>
+            <member>
+                <link linkend="colormap">colormap</link>
+            </member>
+        </simplelist>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/graphics/macros/getcolor.sci b/scilab/modules/graphics/macros/getcolor.sci
index 19a4282..133780b 100644
--- a/scilab/modules/graphics/macros/getcolor.sci
+++ b/scilab/modules/graphics/macros/getcolor.sci
@@ -1,8 +1,7 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) INRIA
-// Copyright (C) 2017 - Samuel GOUGEON
-//
 // Copyright (C) 2012 - 2016 - Scilab Enterprises
+// Copyright (C) 2017, 2021 - Samuel GOUGEON
 //
 // This file is hereby licensed under the terms of the GNU GPL v2.0,
 // pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -57,32 +56,33 @@ function [c] = getcolor(Title,cini)
     else
         cmap = []
         curwin = []
-    end;
+    end
 
     // create the window for getcolor
-    fig = scf();
-    fig.visible = "off";
+    fig = figure("visible","off","background",-2); //scf();
     win = fig.figure_id;
 
     sdf;    // quite agressive. Not sure it is actually useful
     sda;    // same remark
     if cmap~=[] then
         fig.color_map = cmap;
+        fig.figure_name = gettext("Current colormap")
     else
         cmap = fig.color_map;
+        fig.figure_name = gettext("Default colormap")
     end;
 
     N = size(cmap,1);
     wdim = [1,1];
-    r = wdim(1)/wdim(2);
-    n = round(sqrt(N/r));
-    m = int(n*r);
-    H = m*45; // These numbers set the size of the getcolor window
-    W = n*45;
-    fig.figure_size = [H,W];
+    m = ceil(sqrt(N));
+    n = ceil(N/m);
+    [W, H] = (max(m*35,320), n*40)  // minW=320 for infos in status bar
+    fig.axes_size = [W,H];
+    // position = center of screen:
+    c = get(0,"screensize_px")
+    fig.figure_position = [c(3)-W, c(4)-fig.figure_size(2)]/2
 
     toolbar(win, "off")
-
     delmenu(win, gettext("&File"))
     delmenu(win, gettext("&Tools"))
     delmenu(win, gettext("&Edit"))
@@ -101,32 +101,31 @@ function [c] = getcolor(Title,cini)
         end;
         rects = [rects,R+[x;y;0;0]];
         y = y-dy;
-    end;
+    end
 
     if Title~="" then
         xsetech([-1/8,0,1+1/6,1+1/6-1/8],[0,0,wdim(1),wdim(2)]);
     else
         xsetech([-1/8,-1/8,1+1/6,1+1/6],[0,0,wdim(1),wdim(2)]);
-    end;
+    end
     // rectangles with the colors
     xrects(rects,1:N);
+
     // frame around the colors
     r = m*n-N;
     ddx = 0.05*dx;
     ddy = 0.05*dy;
-    if r==0 then
+    if abs(r)<0.1 then
         xpoly([-ddx,1,1,-ddx],[0,0,1+ddy,1+ddy],"lines",1);
     else
-        xpoly([-ddx,1-1/n,1-1/n,1,1,-ddx],[0,0,r/m,r/m,1+ddy,1+ddy],"lines",1);
-    end;
+        xpoly([-ddx, 1-dx, 1-dx, 1   ,   1  ,-ddx],..
+              [  0 ,   0 , r*dy, r*dy, 1+ddy,1+ddy], "lines",1);
+    end
 
     // title
     if Title~="" then
-        xtitle(Title);
-        t = gce();
-        t.font_size = 4;
-        t.font_style = 6;
-    end;
+        title(Title, "fontsize",3, "font_style",6)
+    end
 
     k1 = min(max(cini,1),N);
     xrects(rects(eye(),k1),-k1);
@@ -142,6 +141,7 @@ function [c] = getcolor(Title,cini)
 
     addmenu(win, gettext("Ok"));
     addmenu(win, gettext("Cancel"));
+    set(gca(),"tight_limits","on","axes_bounds",[0 0 1 1],"margins",[.05 .05 .15 .05]);
     fig.visible = "on";
 
     c_i = 0;
@@ -158,7 +158,7 @@ function [c] = getcolor(Title,cini)
         elseif (c_i== -2) then
             if str==Ok then k = k1; c = k; break;end;
             if str==Cancel then k = []; c = []; break;end;
-        end;
+        end
 
         mc = int(cx/dx)+1;
         nc = n-int(cy/dy);
@@ -184,8 +184,6 @@ function [c] = getcolor(Title,cini)
 
     if curwin~=[] then
         scf(curwin);
-    end;
-
-
+    end
 endfunction
 
diff --git a/scilab/modules/helptools/images/getcolor.png b/scilab/modules/helptools/images/getcolor.png
new file mode 100644
index 0000000000000000000000000000000000000000..51b82ef7fbdd58c6343fdbe6597d84f911846487
GIT binary patch
literal 6483
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

literal 0
HcmV?d00001

-- 
1.7.9.5