Merge branch 'erik-700-barcodes' into erik-750-slider

toitware · Dec 5, 2023 · e98e53b · e98e53b
2 parents ff2a254 + 0d734e2
commit e98e53b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/src/pixel_display.toit b/src/pixel_display.toit
@@ -371,7 +371,7 @@ abstract class PixelDisplay implements Window:
           round_down (max_canvas_height_ width) y_rounding_
           y_rounding_
       // Don't widen any more if the patches are already too flat to fill the full height.
-      if max_height <= driver_.height: break
+      if max_height < driver_.height: break
       // Don't widen any more if the patches already cover the whole width.
       if width >= driver_.width: break
       width_target += width_target

diff --git a/src/png.toit b/src/png.toit
@@ -13,9 +13,6 @@ class PngElement extends CustomElement:
   h/int
   png_/AbstractPng
 
-  min_w: return w
-  min_h: return h
-
   constructor --x/int?=null --y/int?=null png_file/ByteArray:
     info := PngInfo png_file
     if info.uncompressed_random_access:

diff --git a/tests/style_test.toit b/tests/style_test.toit
@@ -141,12 +141,6 @@ abstract class TestElement extends Element:
   draw canvas/Canvas -> none:
     unreachable
 
-  min_w -> int:
-    unreachable
-
-  min_h -> int:
-    unreachable
-
 class Square extends TestElement:
   type -> string: return "square"
   color/int := 0