Mercurial > octave

changeset 27843:48c77d47ea81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
legend.m: Simplify automatic column number computation (bug #57418) * legend.m (update_texticon_position): When "numcolumnmode" is "auto", fix the number of columns depending on the oriention : 1 for vertical, nitem for horizontal.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Sun, 15 Dec 2019 20:01:14 +0100
parents e79999c5d782
children e06ce39f78ad
files scripts/plot/appearance/legend.m
diffstat 1 files changed, 4 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/plot/appearance/legend.m	Mon Dec 16 01:47:18 2019 -0500
+++ b/scripts/plot/appearance/legend.m	Sun Dec 15 20:01:14 2019 +0100
@@ -1091,22 +1091,6 @@
     ext = abs (cell2mat (ext)(:,3:4));
   endif
 
-  ## Maximum allowable size for the legend
-  hax = getappdata (hl, "__axes_handle__")(1);
-  units = get (hax, "units");
-  unwind_protect
-    set (hax, "units", "points");
-    max_size = get (hax, "position")(3:4);
-  unwind_protect_cleanup
-    set (hax, "units", units);
-  end_unwind_protect
-
-  location = get (hl, "location");
-  outside = strcmp (location(end-3:end), "side");
-  if (! outside)
-    max_size *= .90;
-  endif
-
   autolayout = strcmp (get (hl, "numcolumnsmode"), "auto");
   xmax = ymax = 0;
   iter = 1;
@@ -1114,20 +1098,13 @@
   if (strcmp (get (hl, "orientation"), "vertical"))
 
     if (autolayout)
-      if (any (strcmpi (location, {"north", "northoutside",
-                                   "south", "southoutside"})))
-        ##FIXME: handle autolayout for these in a better fashion
-        nrow = 1;
-      else
-        nrow = max (find ((cumsum (ext(:,2) + vmargin) + vmargin) ...
-                          < max_size(2)));
-      endif
-      ncol = ceil (nitem / nrow);
+      ncol = 1;
     else
       ncol = min (nitem, get (hl, "numcolumns"));
-      nrow = ceil (nitem / ncol);
     endif
 
+    nrow = ceil (nitem / ncol);
+
     rowheights = arrayfun (@(idx) max([icon_height; ext(idx:nrow:end, 2)]), ...
                            1:nrow);
     x = hmargin;
@@ -1164,18 +1141,9 @@
   else
 
     if (autolayout)
-      if (any (strcmpi (location, {"north", "northoutside",
-                                   "south", "southoutside"})))
-        ##FIXME: handle autolayout for these in a better fashion
-        ncol = nitem;
-      else
-        ncol = max (find ((cumsum (ext(:,1) + 2*hmargin ...
-                                   + icon_width) + hmargin) ...
-                          < max_size(1)));
-      endif
+      ncol = nitem;
     else
       ncol = min (nitem, get (hl, "numcolumns"));
-      nrow = ceil (nitem / ncol);
     endif
 
     nrow = ceil (nitem / ncol);