Merge pull request #10 from bbulpett/add_side_margins

Add side margins
bbulpett · Jul 11, 2016 · d8577c4 · d8577c4
2 parents b75a37d + 7af2f61
commit d8577c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/zebra/zpl/printable.rb b/lib/zebra/zpl/printable.rb
@@ -7,15 +7,17 @@ def initialize(message)
         end
       end
 
-      attr_reader :position, :x, :y
+      attr_reader :position, :x, :y, :margin
       attr_accessor :data
 
       def initialize(options = {})
         options.each_pair { |attribute, value| self.__send__ "#{attribute}=", value }
       end
 
       def position=(coords)
-        @position, @x, @y = coords, coords[0], coords[1]
+        @position = coords
+        @x = (@margin.nil? || @margin == 0) ? coords[0] : @margin
+        @y = coords[1]
       end
 
       def justification=(just)
@@ -27,6 +29,10 @@ def justification
         @justification || Justification::LEFT
       end
 
+      def margin=(margin)
+        @margin = margin || 0
+      end
+
       def rotation=(rot)
         Rotation.validate_rotation rot
         @rotation = rot

diff --git a/lib/zebra/zpl/text.rb b/lib/zebra/zpl/text.rb
@@ -13,7 +13,11 @@ def font_size=(f)
       end
 
       def width=(width)
-        @width = width || 0
+        unless (margin.nil? || margin < 1)
+          @width = (width - (margin*2))
+        else
+          @width = width || 0
+        end
       end
 
       def font_type=(type)