rubytext 0.0.71 → 0.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba1e44016afa687e37e3233162615824f10f6ca66aa6a44280119e608d92843
-  data.tar.gz: 6abaef119351e6994926a83ae452adcc35dddf1e946327fafaf1e832f9e77a0b
+  metadata.gz: b3736e2791cf23d42807517df4cfe769d2ec39a37e1d83f5c821b659f4303927
+  data.tar.gz: eb10a35201cfb772ed3e305e4810d411a9172804932fdca6bdf0fac6ac4d46c7
 SHA512:
-  metadata.gz: debbda96ab1dd24c0362702297740417fae2cd8068c97ad4aa3b3885fe226a3ff602c32568fbe3f0caa301d912e3867d9c8448e4a45013d35f38decac43db214
-  data.tar.gz: f31966fc64d1fbd2a2550e395f2d463e40d39c75be3a4d0d9e85dcf5b43a5a0d9d94d656305cc7bc4e5c6f8322c55e79961b6bd77b5fd8388bd456de39fdcbbe
+  metadata.gz: 9ec76711b390cc2f70b323ec1d22163beb03b56947f5f3b9ab18545968f55cb7aaf7053933430f3bd4512ba20d3f90e23aef8b8a58ba524c154dcd3ce78fd015
+  data.tar.gz: 9a0603eaee4606b092963aa85b0dd71babbff7ba9304e80a08c315da2a3cf2acb74fb44faa62c9eb264b52f77c84445a24a0a8017d603423dfe9b8cdcba56902

data/lib/menu.rb

@@ -3,16 +3,16 @@ module RubyText
   def self.saveback(high, wide, r, c)
     @pos = STDSCR.rc
     @save = []
-    0.upto(high) do |h|
-      0.upto(wide) do |w|
+    0.upto(high-1) do |h|
+      0.upto(wide-1) do |w|
         @save << STDSCR[h+r, w+c]
       end
     end
   end
 
   def self.restback(high, wide, r, c)
-    0.upto(high) do |h|
-      0.upto(wide) do |w|
+    0.upto(high-1) do |h|
+      0.upto(wide-1) do |w|
         STDSCR[h+r, w+c] = @save.shift
       end
     end
@@ -20,22 +20,23 @@ module RubyText
     STDSCR.refresh
   end
 
-  def self.menu(r: 0, c: 0, items:, curr: 0)
+  def self.menu(r: 0, c: 0, items:, curr: 0,
+                fg: White, bg: Blue)
     high = items.size + 2
     wide = items.map(&:length).max + 4
     saveback(high, wide, r, c)
-    win = RubyText.window(high, wide, r, c, fg: White, bg: Blue)
-    RubyText.set(:raw)
+    win = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
+#   RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
     sel = curr
     max = items.size - 1
-    norm = RubyText::Effects.new(win, :normal, White)
-    bold = RubyText::Effects.new(win, :bold, Yellow)
+    norm = RubyText::Effects.new(win, :normal)
+    rev = RubyText::Effects.new(win, :reverse)
     loop do
       items.each.with_index do |item, row|
         win.go row, 0
-        style = (sel == row) ? bold : norm
+        style = (sel == row) ? rev : norm
         win.print style, " #{item} "
       end
       ch = getch
@@ -54,23 +55,25 @@ module RubyText
     end
   end
 
-  def self.selector(r: 0, c: 0, rows: 10, cols: 20, items:, 
-               win:, callback:, enter: nil, quit: "q")
+  def self.selector(r: 0, c: 0, rows: 10, cols: 20, 
+                    items:, fg: White, bg: Blue,
+                    win:, callback:, enter: nil, quit: "q")
     high = rows
     wide = cols
     saveback(high, wide, r, c)
-    menu_win = RubyText.window(high, wide, r, c, fg: White, bg: Blue)
+    menu_win = RubyText.window(high, wide, r, c, fg: fg, bg: bg)
     win2 = win
     handler = callback
-    RubyText.set(:raw)
+#   RubyText.set(:raw)
     X.stdscr.keypad(true)
     RubyText.hide_cursor
-    norm = RubyText::Effects.new(:normal, White)
-    rev  = RubyText::Effects.new(:reverse, White)
+    norm = RubyText::Effects.new(menu_win, :normal)
+    rev  = RubyText::Effects.new(menu_win, :reverse)
     sel = 0
     max = items.size - 1
     send(handler, sel, items[sel], win2)
     loop do
+      menu_win.home
       items.each.with_index do |item, row|
         menu_win.left
         style = (sel == row) ? rev : norm

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module RubyText
-  VERSION = "0.0.71"
+  VERSION = "0.0.72"
 
   Path  = File.expand_path(File.join(File.dirname(__FILE__)))
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytext
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.72
 platform: ruby
 authors:
 - Hal Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses