uh-layout 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5eb173000501f534469ab6801bd388d44d309f3
-  data.tar.gz: 014263683a19cedca1cb588cbc65d5cfaafb0254
+  metadata.gz: 3b068d5ba61ed20730d5bd7fc9a28f63db1695d6
+  data.tar.gz: da418aef2a7c8a918ed448a8c56a2c4b1dba7cfb
 SHA512:
-  metadata.gz: 7a188d97b67af33cacf8466fb7216364ec782b74dc1688d1e27a0a08df31989c656e647a395dc03839b012d6412de4208a37f84a8f1095f20567d82e38a7a646
-  data.tar.gz: 8003a17f7f10d7a35df2510a9913b104f1ef4295873689d36cc8874926087d5590266588d01fde91fd38d28d5f16418e19f7ad9667192dfc1c9e159336e0a2ca
+  metadata.gz: 691f8d9fcef6d65d269de2385a9adecd525a07c92552d4caf664254c6842aa9f5693d3945820da8474ec68e3e35f78866b9b591e41eaf77696422178f3a36dc4
+  data.tar.gz: 49c221e1a5e1c9e7c6581b13577ab1016165cdb1bfd4963e6ca78bd589c4c07ed1b873a0d57545c26920cd8f7c2282c6f6492d841118a0da95a1319df7e76b64

data/lib/uh/layout/bar.rb

@@ -1,10 +1,10 @@
 module Uh
   class Layout
     class Bar
-      TEXT_PADDING_X    = 1
+      TEXT_PADDING_X    = 3
       TEXT_PADDING_Y    = 1
-      COLUMN_MARGIN_TOP = 0
-      COLUMN_HEIGHT     = 2
+      BORDER_HEIGHT     = 2
+      BORDER_PADDING_Y  = 0
       COLUMN_PADDING_X  = 1
       TAG_PADDING_X     = 5
 
@@ -36,9 +36,10 @@ module Uh
 
       def redraw
         draw_background
-        draw_columns @screen.current_tag.columns,
-          @screen.current_tag.current_column
-        draw_tags @screen.tags, @screen.current_tag
+        draw_columns BORDER_HEIGHT + BORDER_PADDING_Y,
+          @screen.current_tag.columns, @screen.current_tag.current_column
+        draw_tags BORDER_HEIGHT + BORDER_PADDING_Y + text_line_height,
+          @screen.tags, @screen.current_tag
         blit
       end
 
@@ -61,7 +62,7 @@ module Uh
       end
 
       def build_geo(layout_geo)
-        bar_height = text_line_height * 2 + COLUMN_HEIGHT + 1
+        bar_height = text_line_height * 2 + BORDER_HEIGHT + BORDER_PADDING_Y
 
         Uh::Geo.new(
           layout_geo.x,
@@ -79,14 +80,6 @@ module Uh
         @display.font.height + TEXT_PADDING_Y * 2
       end
 
-      def column_widget_text_y
-        COLUMN_MARGIN_TOP + COLUMN_HEIGHT
-      end
-
-      def column_widget_height
-        column_widget_text_y + text_line_height + 1
-      end
-
       def column_offset_x(column)
         column.x - x
       end
@@ -103,28 +96,29 @@ module Uh
       def draw_background
         @pixmap.gc_color @colors[:bg]
         @pixmap.draw_rect 0, 0, width, height
+        @pixmap.gc_color active_color
+        @pixmap.draw_rect 0, 0, width, BORDER_HEIGHT
       end
 
-      def draw_columns(columns, current_column)
+      def draw_columns(y_offset, columns, current_column)
         columns.each do |column|
-          draw_column column, column == current_column
+          draw_column y_offset, column, column == current_column
         end
       end
 
-      def draw_column(column, current)
-        @pixmap.gc_color current ? active_color : @colors[:hi]
-        @pixmap.draw_rect column_offset_x(column) + COLUMN_PADDING_X,
-          COLUMN_MARGIN_TOP,
-          column.width - COLUMN_PADDING_X, COLUMN_HEIGHT
-        @pixmap.gc_color @colors[:fg]
-        text_y =
-          column_widget_text_y + @display.font.ascent + TEXT_PADDING_Y
-        @pixmap.draw_string column_offset_x(column) + TEXT_PADDING_Y,
-          text_y, column_text(column)
+      def draw_column(y_offset, column, current)
+        x_offset = column_offset_x(column)
+        if current
+          @pixmap.gc_color @colors[:sel]
+          @pixmap.draw_rect x_offset, y_offset, column.width, text_line_height
+        end
+        text_y = y_offset + @display.font.ascent + TEXT_PADDING_Y
+        draw_text column_text(column), x_offset, y_offset,
+          bg: current ? @colors[:hi] : @colors[:bg]
       end
 
-      def draw_tags(tags, current_tag)
-        tags.sort_by(&:id).inject(0) do |offset, tag|
+      def draw_tags(y_offset, tags, current_tag)
+        tags.sort_by(&:id).inject(0) do |x_offset, tag|
           color = if tag == current_tag
             active_color
           elsif tag.clients.any?
@@ -133,24 +127,22 @@ module Uh
             @colors[:bg]
           end
 
-          offset + draw_text(
-            tag.id, offset, column_widget_height,
-            @colors[:fg], color,
-            TAG_PADDING_X
+          x_offset + draw_text(tag.id, x_offset, y_offset,
+            bg:         color,
+            padding_x:  TAG_PADDING_X
           )
         end
       end
 
-      def draw_text(text, x, y, color_fg = @colors[:fg], color_bg = nil,
-          padding_x = TEXT_PADDING_X)
+      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_y      = y + @display.font.ascent + TEXT_PADDING_Y
-        if color_bg
-          @pixmap.gc_color color_bg
+        if bg
+          @pixmap.gc_color bg
           @pixmap.draw_rect x, y, text_width, text_line_height
         end
-        @pixmap.gc_color color_fg
+        @pixmap.gc_color @colors[:fg]
         @pixmap.draw_string x + padding_x, text_y, text
         text_width
       end

data/lib/uh/layout/version.rb

@@ -1,5 +1,5 @@
 module Uh
   class Layout
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uh-layout
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Thibault Jouan