Mercurial > octave

diff scripts/plot/draw/colorbar.m @ 28310:1379ebcb00c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace uses of axes property "activepositionproperty" by "positionconstraint" (bug #58336). * appearance/daspect.m, appearance/private/__gnuplot_legend__.m, draw/colorbar.m, draw/plotyy.m, draw/semilogx.m, draw/semilogy.m, util/__actual_axis_position__.m, util/private/__gnuplot_draw_axes__.m, util/struct2hdl.m, util/subplot.m: Replace all uses of axes property "activepositionproperty" (which is a hidden property now) by "positionconstraint". * graphics.in.h: Remove FIXME note.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 18 May 2020 13:02:20 +0200
parents bd51beb6205e
children 4deb794d85e2
line wrap: on
line diff
--- a/scripts/plot/draw/colorbar.m	Mon May 18 18:10:39 2020 +0900
+++ b/scripts/plot/draw/colorbar.m	Mon May 18 13:02:20 2020 +0200
@@ -219,7 +219,7 @@
     set (hax, "units", orig_props.units,
               "position", orig_props.position,
               "outerposition", orig_props.outerposition,
-              "activepositionproperty", orig_props.activepositionproperty);
+              "positionconstraint", orig_props.positionconstraint);
     set (hax, "units", units);
   endif
 
@@ -251,7 +251,7 @@
     ## FIXME: Matlab does not require the "position" property to be active.
     ##        Is there a way to determine the plotbox position for the
     ##        gnuplot graphics toolkit when the outerposition is active?
-    set (hax, "activepositionproperty", "position");
+    set (hax, "positionconstraint", "innerposition");
     props = get (hax);
     props.__axes_handle__ = hax;
     position = props.position;
@@ -276,7 +276,7 @@
     ## Create colorbar axes if necessary
     if (new_colorbar)
       hcb = axes ("parent", hpar, "tag", "colorbar",
-                  "activepositionproperty", "position", "position", cbpos,
+                  "positionconstraint", "innerposition", "position", cbpos,
                   "colormap", cmap,
                   "box", "on", "xdir", "normal", "ydir", "normal");
 
@@ -438,7 +438,7 @@
     set (hax, "units", orig_props.units,
               "position", orig_props.position,
               "outerposition", orig_props.outerposition,
-              "activepositionproperty", orig_props.activepositionproperty);
+              "positionconstraint", orig_props.positionconstraint);
     set (hax, "units", units);
 
     ## Nullify colorbar link (can't delete properties yet)
@@ -534,7 +534,7 @@
       scale = [scale, 1];
     endif
     if (strcmp (get (cf, "__graphics_toolkit__"), "gnuplot")
-        && strcmp (props.activepositionproperty, "outerposition"))
+        && strcmp (props.positionconstraint, "outerposition"))
       props.outerposition = props.outerposition .* [1, 1, scale];
       off = 0.5 * (props.outerposition (3:4) - __actual_axis_position__ (props)(3:4));
     else
@@ -884,7 +884,7 @@
 %! shading interp;
 %! axis ("tight", "square");
 %! colorbar ();
-#%! axes ("color","none","box","on","activepositionproperty","position");
+#%! axes ("color", "none", "box", "on", "positionconstraint", "innerposition");
 
 %!demo
 %! clf;