uh-layout 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca5769ff37a5c22c8bc3706f22efce055edc717
-  data.tar.gz: 3cceb31d660ec6f2fa63e2975adf075377095fb4
+  metadata.gz: 0e7f4858efe8b6d9ee912cb9d44d079196afecec
+  data.tar.gz: 2310f35802017071d7e96d96c6e58e754fed081a
 SHA512:
-  metadata.gz: c6c21ded8c3b0fef4c4497c7e6783343ffc8571c5aa883f098a10ab1c76d1b8ad58af8895a07be12922b974ebae926167c2c9c92c1d968303801393222aefcc0
-  data.tar.gz: b55f1a21d29e7ce29f314e367f408f7183178250a7dd5b8154fb7b2954a4700ce40cc148911a2f0dfafef9f040115bbe9ff22a440d7cd6f6f3fa0cab31a3ce73
+  metadata.gz: c8fc50f2837acf00921c01adb7b55b2cda10788c79ebdd110712e5545a945b88b08077cfcd7a20ca69b9262a76e87401e233351907ece31dc569e79a62f8b914
+  data.tar.gz: 1ea07ba5be3797274ff42007feb9386f0970738668a0d1c9e3323d7ce7fb57d4c1bab581810cf2cbf197af25ff40d5c6ccc73994d57606fd1617d35dc538865f

data/lib/uh/layout/bar.rb

@@ -10,7 +10,7 @@ module Uh
 
       include GeoAccessors
 
-      attr_writer :active
+      attr_writer :active, :status
 
       def initialize(display, screen, colors)
         @display    = display
@@ -40,6 +40,10 @@ module Uh
           @screen.current_tag.columns, @screen.current_tag.current_column
         draw_tags BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
           @screen.tags, @screen.current_tag
+        if @status
+          draw_status BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
+            @status
+        end
         blit
       end
 
@@ -80,6 +84,10 @@ module Uh
         @display.font.height + TEXT_PADDING_Y * 2
       end
 
+      def text_width(text, padding_x: TEXT_PADDING_X)
+        text.length * @display.font.width + padding_x * 2
+      end
+
       def column_offset_x(column)
         column.x - x
       end
@@ -134,9 +142,13 @@ module Uh
         end
       end
 
+      def draw_status(y_offset, status)
+        draw_text status, width - text_width(status), y_offset
+      end
+
       def draw_text(text, x, y, bg: nil, padding_x: TEXT_PADDING_X)
         text        = text.to_s
-        text_width  = text.length * @display.font.width + padding_x * 2
+        text_width  = text_width text, padding_x: padding_x
         text_y      = y + @display.font.ascent + TEXT_PADDING_Y
         if bg
           @pixmap.gc_color bg

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

data/lib/uh/layout.rb

@@ -129,7 +129,7 @@ module Uh
     end
 
     def handle_client_swap(direction)
-      return unless current_client
+      return unless current_client && current_column.clients.size >= 2
       current_column.client_swap direction
       update_widgets
     end

data/spec/uh/layout_spec.rb

@@ -350,6 +350,14 @@ module Uh
         end
       end
 
+      context 'with one column and two clients' do
+        before { layout << client }
+
+        it 'does not raise any error' do
+          expect { layout.handle_client_swap :pred }.not_to raise_error
+        end
+      end
+
       context 'with one column and two clients' do
         before { layout << other_client << client }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uh
@@ -126,4 +126,3 @@ test_files:
 - spec/uh/layout/screen_spec.rb
 - spec/uh/layout/tag_spec.rb
 - spec/uh/layout_spec.rb
-has_rdoc: