grmenu 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c028e16af097dddc8e61b7cc766cc6a7f1870616e3c5169c832fe6edcf79fb55
-  data.tar.gz: 1c0070cb22cebd71fa4b235c0cea7bd51c1af58c7b662fbe5bd2d9976709e774
+  metadata.gz: 4cfab6080b581db0dddff8e9285cb831f70f259bb9da2965761702829c07292f
+  data.tar.gz: 172214b97293124225a3f6eef3f9b71842d3e49a7159e3cc27bacc407ec6db66
 SHA512:
-  metadata.gz: ba425e3a5e0a2d4692f9bc79e249a8303a245e0aeca137bd343fee489020d6b3f1b4c37147751ca4d5c05ab119b97848f6f7470803984550c69b93c0ae77a8cc
-  data.tar.gz: 90959c3c3c4ae76ec8bca759faea2ecdb801ee8fbc977bfae15618ad3af603202c95b2192e0296193cee5a933a0aa93e2ac559db84e0a967380c3e4737839c50
+  metadata.gz: 2437295ff5176fc4ace40768e03e7cd25ecbfa0e1562ef625e348eac1f69c7e91c60b2cedf3d48c0f4a9285272978e8b0ae3ec8c1a81e3dbf2c47296b4ef7d0d
+  data.tar.gz: 021bf58afb13dce516963e7bb16b0fe5830498c2e88ab961a6dca0c4f7d5dc13e54fde83cf89b2b5a89a632f9a63a107539a462b82b65ec60f64e78f92eefee8

data/README.md

@@ -1,4 +1,4 @@
-# GRmenu (Ruby) v4.0.2
+# GRmenu (Ruby) v4.1.0
 
 **Suite TUI Profesional y Ligera para la Creación de Interfaces de Línea de Comandos en Terminales TTY.**
 
@@ -73,7 +73,7 @@ gem install grmenu
 ### Vía Gemfile
 
 ```ruby
-gem 'grmenu', '~> 4.0'
+gem 'grmenu', '~> 4.1'
 ```
 
 ### Requerimiento en scripts de Ruby
@@ -95,7 +95,7 @@ require 'grmenu'
 GRmenu.theme(:neon_red)
 
 def saludar
-  GRmenu.alert(:success, "Bienvenido a GRmenu v4.0.2!")
+  GRmenu.alert(:success, "Bienvenido a GRmenu v4.1.0!")
 end
 
 def ver_tabla

data/data/help.txt

@@ -8,7 +8,7 @@
 {bright_cyan}╚═══════════════════════════════════════════════════════════════════════════════════╝{reset}
 
 {bright_cyan}╔═══════════════════════════════════════════════════════════════════════════════════╗{reset}
-{bright_cyan}║{bright_yellow}             DOCUMENTACION Y GUIA COMPLETA DE PARAMETROS (v4.0.2)                  {bright_cyan}║{reset}
+{bright_cyan}║{bright_yellow}             DOCUMENTACION Y GUIA COMPLETA DE PARAMETROS (v4.1.0)                  {bright_cyan}║{reset}
 {bright_cyan}║{gray}  Soporte Raton SGR 1006, Submenus en Cascada 3 Niveles, Pestanas y CSS .gr        {bright_cyan}║{reset}
 {bright_cyan}╚═══════════════════════════════════════════════════════════════════════════════════╝{reset}
 

data/grmenu.rb

@@ -6,7 +6,7 @@ require 'zlib'
 require 'open3'
 
 class GRmenu
-  VERSION               = "4.0.2"
+  VERSION               = "4.1.0"
   CLEAR_SCREEN_SEQUENCE = "\e[H\e[2J\e[3J"
   HIDE_CURSOR           = "\e[?25l"
   SHOW_CURSOR           = "\e[?25h"
@@ -1531,10 +1531,24 @@ class GRmenu
       @divider  = divider.dup
       @font     = font.to_i
       @desc_prefix = desc_prefix.to_s
+      @explicitly_set = {}
     end
 
-    def desc_prefix(prefix_str = nil)
+    def explicitly_set?(key)
+      @explicitly_set ||= {}
+      @explicitly_set[key.to_sym] == true || self.class.explicitly_set?(key)
+    end
+
+    def mark_explicit(key)
+      @explicitly_set ||= {}
+      @explicitly_set[key.to_sym] = true
+    end
+
+    def desc_prefix(prefix_str = nil, from_css: false)
       return @desc_prefix if prefix_str.nil?
+      return self if from_css && explicitly_set?(:desc_prefix)
+      @explicitly_set ||= {}
+      @explicitly_set[:desc_prefix] = true unless from_css
       @desc_prefix = prefix_str.to_s
       self
     end
@@ -1542,8 +1556,11 @@ class GRmenu
     alias_method :desc_prefix=, :desc_prefix
     alias_method :description_prefix=, :desc_prefix
 
-    def border(color_name = nil, brightness_level = 1)
+    def border(color_name = nil, brightness_level = 1, from_css: false)
       return @border if color_name.nil?
+      return self if from_css && explicitly_set?(:border)
+      @explicitly_set ||= {}
+      @explicitly_set[:border] = true unless from_css
       @border = parse_color(color_name, brightness_level)
       self
     end
@@ -1551,8 +1568,11 @@ class GRmenu
     alias_method :set_border, :border
     alias_method :border=, :border
 
-    def options(color_name = nil, brightness_level = 1)
+    def options(color_name = nil, brightness_level = 1, from_css: false)
       return @options if color_name.nil?
+      return self if from_css && explicitly_set?(:options)
+      @explicitly_set ||= {}
+      @explicitly_set[:options] = true unless from_css
       @options = parse_color(color_name, brightness_level)
       self
     end
@@ -1560,8 +1580,11 @@ class GRmenu
     alias_method :set_options, :options
     alias_method :options=, :options
 
-    def focus(color_name = nil, brightness_level = 2)
+    def focus(color_name = nil, brightness_level = 2, from_css: false)
       return @focus if color_name.nil?
+      return self if from_css && explicitly_set?(:focus)
+      @explicitly_set ||= {}
+      @explicitly_set[:focus] = true unless from_css
       @focus = parse_color(color_name, brightness_level)
       self
     end
@@ -1569,8 +1592,11 @@ class GRmenu
     alias_method :set_focus, :focus
     alias_method :focus=, :focus
 
-    def title(color_name = nil, brightness_level = 2)
+    def title(color_name = nil, brightness_level = 2, from_css: false)
       return @title if color_name.nil?
+      return self if from_css && explicitly_set?(:title)
+      @explicitly_set ||= {}
+      @explicitly_set[:title] = true unless from_css
       @title = parse_color(color_name, brightness_level)
       self
     end
@@ -1578,8 +1604,11 @@ class GRmenu
     alias_method :set_title, :title
     alias_method :title=, :title
 
-    def banner(color_name = nil, brightness_level = 2)
+    def banner(color_name = nil, brightness_level = 2, from_css: false)
       return @banner if color_name.nil?
+      return self if from_css && explicitly_set?(:banner)
+      @explicitly_set ||= {}
+      @explicitly_set[:banner] = true unless from_css
       @banner = parse_color(color_name, brightness_level)
       self
     end
@@ -1587,8 +1616,11 @@ class GRmenu
     alias_method :set_banner, :banner
     alias_method :banner=, :banner
 
-    def subtitle(color_name = nil, brightness_level = 2)
+    def subtitle(color_name = nil, brightness_level = 2, from_css: false)
       return @subtitle if color_name.nil?
+      return self if from_css && explicitly_set?(:subtitle)
+      @explicitly_set ||= {}
+      @explicitly_set[:subtitle] = true unless from_css
       @subtitle = parse_color(color_name, brightness_level)
       self
     end
@@ -1596,8 +1628,11 @@ class GRmenu
     alias_method :set_subtitle, :subtitle
     alias_method :subtitle=, :subtitle
 
-    def divider(color_name = nil, brightness_level = 1)
+    def divider(color_name = nil, brightness_level = 1, from_css: false)
       return @divider if color_name.nil?
+      return self if from_css && explicitly_set?(:divider)
+      @explicitly_set ||= {}
+      @explicitly_set[:divider] = true unless from_css
       @divider = parse_color(color_name, brightness_level)
       self
     end
@@ -1605,8 +1640,11 @@ class GRmenu
     alias_method :set_divider, :divider
     alias_method :divider=, :divider
 
-    def font(font_id = nil)
+    def font(font_id = nil, from_css: false)
       return @font if font_id.nil?
+      return self if from_css && explicitly_set?(:font)
+      @explicitly_set ||= {}
+      @explicitly_set[:font] = true unless from_css
       @font = font_id.to_i
       self
     end
@@ -1625,74 +1663,111 @@ class GRmenu
     end
 
     class << self
-      def border(color_name = nil, brightness_level = 1)
+      def explicitly_set?(key)
+        @explicitly_set ||= {}
+        @explicitly_set[key.to_sym] == true
+      end
+
+      def mark_explicit(key)
+        @explicitly_set ||= {}
+        @explicitly_set[key.to_sym] = true
+      end
+
+      def border(color_name = nil, brightness_level = 1, from_css: false)
         @default_border ||= { color: "cyan", level: 1 }
         return @default_border if color_name.nil?
+        return @default_border if from_css && explicitly_set?(:border)
+        @explicitly_set ||= {}
+        @explicitly_set[:border] = true unless from_css
         @default_border = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Border, :border
       alias_method :border=, :border
 
-      def options(color_name = nil, brightness_level = 1)
+      def options(color_name = nil, brightness_level = 1, from_css: false)
         @default_options ||= { color: "white", level: 1 }
         return @default_options if color_name.nil?
+        return @default_options if from_css && explicitly_set?(:options)
+        @explicitly_set ||= {}
+        @explicitly_set[:options] = true unless from_css
         @default_options = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Options, :options
       alias_method :options=, :options
 
-      def focus(color_name = nil, brightness_level = 2)
+      def focus(color_name = nil, brightness_level = 2, from_css: false)
         @default_focus ||= { color: "green", level: 2 }
         return @default_focus if color_name.nil?
+        return @default_focus if from_css && explicitly_set?(:focus)
+        @explicitly_set ||= {}
+        @explicitly_set[:focus] = true unless from_css
         @default_focus = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Focus, :focus
       alias_method :focus=, :focus
 
-      def title(color_name = nil, brightness_level = 2)
+      def title(color_name = nil, brightness_level = 2, from_css: false)
         @default_title ||= { color: "yellow", level: 2 }
         return @default_title if color_name.nil?
+        return @default_title if from_css && explicitly_set?(:title)
+        @explicitly_set ||= {}
+        @explicitly_set[:title] = true unless from_css
         @default_title = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Title, :title
       alias_method :title=, :title
 
-      def banner(color_name = nil, brightness_level = 2)
+      def banner(color_name = nil, brightness_level = 2, from_css: false)
         @default_banner ||= { color: "magenta", level: 2 }
         return @default_banner if color_name.nil?
+        return @default_banner if from_css && explicitly_set?(:banner)
+        @explicitly_set ||= {}
+        @explicitly_set[:banner] = true unless from_css
         @default_banner = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Banner, :banner
       alias_method :banner=, :banner
 
-      def subtitle(color_name = nil, brightness_level = 2)
+      def subtitle(color_name = nil, brightness_level = 2, from_css: false)
         @default_subtitle ||= { color: "cyan", level: 2 }
         return @default_subtitle if color_name.nil?
+        return @default_subtitle if from_css && explicitly_set?(:subtitle)
+        @explicitly_set ||= {}
+        @explicitly_set[:subtitle] = true unless from_css
         @default_subtitle = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Subtitle, :subtitle
       alias_method :subtitle=, :subtitle
 
-      def divider(color_name = nil, brightness_level = 1)
+      def divider(color_name = nil, brightness_level = 1, from_css: false)
         @default_divider ||= { color: "blue", level: 1 }
         return @default_divider if color_name.nil?
+        return @default_divider if from_css && explicitly_set?(:divider)
+        @explicitly_set ||= {}
+        @explicitly_set[:divider] = true unless from_css
         @default_divider = { color: color_name.to_s, level: brightness_level.to_i }
       end
       alias_method :Divider, :divider
       alias_method :divider=, :divider
 
-      def font(font_id = nil)
+      def font(font_id = nil, from_css: false)
         @default_font ||= 1
         return @default_font if font_id.nil?
+        return @default_font if from_css && explicitly_set?(:font)
+        @explicitly_set ||= {}
+        @explicitly_set[:font] = true unless from_css
         @default_font = font_id.to_i
       end
       alias_method :Font, :font
       alias_method :set_font, :font
       alias_method :font=, :font
 
-      def desc_prefix(prefix_str = nil)
+      def desc_prefix(prefix_str = nil, from_css: false)
         @default_desc_prefix ||= "[i]"
         return @default_desc_prefix if prefix_str.nil?
+        return @default_desc_prefix if from_css && explicitly_set?(:desc_prefix)
+        @explicitly_set ||= {}
+        @explicitly_set[:desc_prefix] = true unless from_css
         @default_desc_prefix = prefix_str.to_s
       end
       alias_method :description_prefix, :desc_prefix
@@ -1709,7 +1784,7 @@ class GRmenu
     end
   end
 
-  attr_accessor :functions, :title, :subtitle, :banner, :banner_style, :divider, :style, :index, :style_config, :center, :page_size, :search, :columns, :query, :image, :image_width
+  attr_accessor :functions, :title, :subtitle, :banner, :banner_style, :divider, :index, :style_config, :center, :page_size, :search, :columns, :query, :image, :image_width
 
   alias_method :options, :functions
   alias_method :options=, :functions=
@@ -1720,6 +1795,19 @@ class GRmenu
   alias_method :description, :subtitle
   alias_method :description=, :subtitle=
 
+  def desc_prefix
+    @desc_prefix || @style_config&.desc_prefix || SetStyle.desc_prefix
+  end
+
+  def desc_prefix=(val)
+    @desc_prefix = val.to_s
+    @style_config&.desc_prefix(val)
+  end
+  alias_method :prefix, :desc_prefix
+  alias_method :prefix=, :desc_prefix=
+  alias_method :description_prefix, :desc_prefix
+  alias_method :description_prefix=, :desc_prefix=
+
   def self.STYLES; STYLES; end
   def self.COLORS; COLORS; end
   def self.BORDERS; BORDERS; end
@@ -1831,38 +1919,40 @@ class GRmenu
     m = (sec["menu"] || {}).merge(glob)
 
     if m && !m.empty?
-      if m["border"] || m["border_color"]
+      if (m["border"] || m["border_color"]) && !SetStyle.explicitly_set?(:border)
         c, l = extract_color_and_level(m["border"] || m["border_color"], 1)
-        SetStyle.border(c, l)
+        SetStyle.border(c, l, from_css: true)
       end
-      if m["title"] || m["title_color"]
+      if (m["title"] || m["title_color"]) && !SetStyle.explicitly_set?(:title)
         c, l = extract_color_and_level(m["title"] || m["title_color"], 2)
-        SetStyle.title(c, l)
+        SetStyle.title(c, l, from_css: true)
       end
-      if m["focus"] || m["focus_color"]
+      if (m["focus"] || m["focus_color"]) && !SetStyle.explicitly_set?(:focus)
         c, l = extract_color_and_level(m["focus"] || m["focus_color"], 2)
-        SetStyle.focus(c, l)
+        SetStyle.focus(c, l, from_css: true)
       end
-      if m["options"] || m["options_color"]
+      if (m["options"] || m["options_color"]) && !SetStyle.explicitly_set?(:options)
         c, l = extract_color_and_level(m["options"] || m["options_color"], 1)
-        SetStyle.options(c, l)
+        SetStyle.options(c, l, from_css: true)
       end
-      if m["banner"] || m["banner_color"]
+      if (m["banner"] || m["banner_color"]) && !SetStyle.explicitly_set?(:banner)
         c, l = extract_color_and_level(m["banner"] || m["banner_color"], 2)
-        SetStyle.banner(c, l)
+        SetStyle.banner(c, l, from_css: true)
       end
-      if m["subtitle"] || m["subtitle_color"]
+      if (m["subtitle"] || m["subtitle_color"]) && !SetStyle.explicitly_set?(:subtitle)
         c, l = extract_color_and_level(m["subtitle"] || m["subtitle_color"], 1)
-        SetStyle.subtitle(c, l)
+        SetStyle.subtitle(c, l, from_css: true)
       end
-      if m["divider"] || m["divider_color"]
+      if (m["divider"] || m["divider_color"]) && !SetStyle.explicitly_set?(:divider)
         c, l = extract_color_and_level(m["divider"] || m["divider_color"], 1)
-        SetStyle.divider(c, l)
+        SetStyle.divider(c, l, from_css: true)
       end
-      if m["desc_prefix"] || m["description_prefix"] || m["prefix"]
-        SetStyle.desc_prefix(m["desc_prefix"] || m["description_prefix"] || m["prefix"])
+      if (m["desc_prefix"] || m["description_prefix"] || m["prefix"]) && !SetStyle.explicitly_set?(:desc_prefix)
+        SetStyle.desc_prefix(m["desc_prefix"] || m["description_prefix"] || m["prefix"], from_css: true)
+      end
+      if m["font"] && !SetStyle.explicitly_set?(:font)
+        SetStyle.font(m["font"].to_i, from_css: true)
       end
-      SetStyle.font(m["font"].to_i) if m["font"]
     end
 
     sec.each do |k, v|
@@ -1871,22 +1961,22 @@ class GRmenu
       c, l = extract_color_and_level(c_val, (v["level"] || 1).to_i)
       case k
       when "border"
-        SetStyle.border(c, l)
+        SetStyle.border(c, l, from_css: true) unless SetStyle.explicitly_set?(:border)
       when "options"
-        SetStyle.options(c, l)
+        SetStyle.options(c, l, from_css: true) unless SetStyle.explicitly_set?(:options)
       when "focus"
-        SetStyle.focus(c, l)
+        SetStyle.focus(c, l, from_css: true) unless SetStyle.explicitly_set?(:focus)
       when "title"
-        SetStyle.title(c, l)
+        SetStyle.title(c, l, from_css: true) unless SetStyle.explicitly_set?(:title)
       when "banner"
-        SetStyle.banner(c, l)
+        SetStyle.banner(c, l, from_css: true) unless SetStyle.explicitly_set?(:banner)
       when "subtitle"
-        SetStyle.subtitle(c, l)
+        SetStyle.subtitle(c, l, from_css: true) unless SetStyle.explicitly_set?(:subtitle)
       when "divider"
-        SetStyle.divider(c, l)
+        SetStyle.divider(c, l, from_css: true) unless SetStyle.explicitly_set?(:divider)
       end
     end
-    SetStyle.font(glob["font"].to_i) if glob["font"]
+    SetStyle.font(glob["font"].to_i, from_css: true) if glob["font"] && !SetStyle.explicitly_set?(:font)
   end
 
   def self.style(css_content)
@@ -2586,7 +2676,7 @@ class GRmenu
     end
   end
 
-  def initialize(functions = [], *positional_arguments, title: nil, banner: nil, subtitle: nil, description: nil, divider: nil, style: nil, banner_style: nil, center: true, font: nil, page_size: nil, search: false, columns: 1, image: nil, image_width: nil, mouse: nil, tabs: nil, active_tab_color: nil, tab_color: nil, **keyword_arguments)
+  def initialize(functions = [], *positional_arguments, title: nil, banner: nil, subtitle: nil, description: nil, divider: nil, style: nil, banner_style: nil, center: true, font: nil, page_size: nil, search: false, columns: 1, image: nil, image_width: nil, mouse: nil, tabs: nil, active_tab_color: nil, tab_color: nil, desc_prefix: nil, prefix: nil, border: nil, border_color: nil, options_color: nil, focus_color: nil, title_color: nil, banner_color: nil, subtitle_color: nil, divider_color: nil, **keyword_arguments)
     tabs_data = tabs || keyword_arguments[:tabs] || (functions.is_a?(Hash) ? functions : nil)
     if tabs_data.is_a?(Hash) && !tabs_data.empty?
       @tabs = tabs_data.keys.map(&:to_s)
@@ -2659,7 +2749,9 @@ class GRmenu
     @cached_image_lines = nil
     @cached_image_cols  = nil
 
-    init_font = font || keyword_arguments[:font_style] || SetStyle.font || 1
+    init_font = font || keyword_arguments[:font] || keyword_arguments[:font_style] || SetStyle.font || 1
+    raw_pfx   = desc_prefix || prefix || keyword_arguments[:desc_prefix] || keyword_arguments[:prefix] || keyword_arguments[:description_prefix]
+    @desc_prefix = raw_pfx.to_s unless raw_pfx.nil?
     init_pfx  = @desc_prefix || (@@global_theme.is_a?(Hash) && (@@global_theme.dig(:sections, 'menu', 'desc_prefix') || @@global_theme.dig(:sections, 'menu', 'prefix'))) || SetStyle.desc_prefix || "[i]"
 
     @style_config = SetStyle.new(
@@ -2673,6 +2765,37 @@ class GRmenu
       font:     init_font,
       desc_prefix: init_pfx
     )
+    @style_config.mark_explicit(:font) if font || keyword_arguments[:font] || keyword_arguments[:font_style]
+    @style_config.mark_explicit(:desc_prefix) unless raw_pfx.nil?
+
+    if border || border_color || keyword_arguments[:border] || keyword_arguments[:border_color]
+      b_c, b_l = self.class.extract_color_and_level(border || border_color || keyword_arguments[:border] || keyword_arguments[:border_color], 1)
+      @style_config.border(b_c, b_l)
+    end
+    if options_color || keyword_arguments[:options_color] || keyword_arguments[:options]
+      o_c, o_l = self.class.extract_color_and_level(options_color || keyword_arguments[:options_color] || keyword_arguments[:options], 1)
+      @style_config.options(o_c, o_l)
+    end
+    if focus_color || keyword_arguments[:focus_color] || keyword_arguments[:focus]
+      f_c, f_l = self.class.extract_color_and_level(focus_color || keyword_arguments[:focus_color] || keyword_arguments[:focus], 2)
+      @style_config.focus(f_c, f_l)
+    end
+    if title_color || keyword_arguments[:title_color]
+      t_c, t_l = self.class.extract_color_and_level(title_color || keyword_arguments[:title_color], 2)
+      @style_config.title(t_c, t_l)
+    end
+    if banner_color || keyword_arguments[:banner_color]
+      bn_c, bn_l = self.class.extract_color_and_level(banner_color || keyword_arguments[:banner_color], 2)
+      @style_config.banner(bn_c, bn_l)
+    end
+    if subtitle_color || keyword_arguments[:subtitle_color]
+      s_c, s_l = self.class.extract_color_and_level(subtitle_color || keyword_arguments[:subtitle_color], 1)
+      @style_config.subtitle(s_c, s_l)
+    end
+    if divider_color || keyword_arguments[:divider_color]
+      d_c, d_l = self.class.extract_color_and_level(divider_color || keyword_arguments[:divider_color], 1)
+      @style_config.divider(d_c, d_l)
+    end
   end
 
   def current_matching_indices
@@ -2772,8 +2895,8 @@ class GRmenu
     end
 
     is_neon_color = color_name.start_with?("neon")
-    is_anim_active = is_neon_color || (@animate && ["diagonal", "linear", "fade", "rgb", "rainbow", "chroma", "neon"].include?(@animate.to_s.downcase))
-    is_chroma = color_name == "rgb" || color_name == "rainbow" || color_name == "chroma" || @animate.to_s.downcase == "rgb"
+    is_anim_active = is_neon_color || (@animate && ["neon", "fade"].include?(@animate.to_s.downcase))
+    is_chroma = color_name == "rgb" || color_name == "rainbow" || color_name == "chroma" || (@animate && ["rgb", "rainbow", "chroma"].include?(@animate.to_s.downcase))
 
     if is_chroma
       tick = @rgb_tick || 0.0
@@ -2822,53 +2945,13 @@ class GRmenu
                BASE_RGB[color_name] || [255, 255, 255]
              end
 
-      if @animate.to_s.downcase == "fade"
-        factor = (Math.sin(tick + phase_offset) + 1.0) / 2.0
-        f = 0.35 + 0.65 * factor
-        r = (base[0] * f).clamp(0, 255).to_i
-        g = (base[1] * f).clamp(0, 255).to_i
-        b = (base[2] * f).clamp(0, 255).to_i
-        glow = (factor > 0.85) ? ";1" : ""
-        return "\e[38;2;#{r};#{g};#{b}#{glow}m#{text}#{self.class.ansi_reset}"
-      else
-        out = String.new("")
-        char_count = 0
-        in_escape = false
-        escape_buf = String.new("")
-
-        text.to_s.each_char do |ch|
-          if ch == "\e"
-            in_escape = true
-            escape_buf << ch
-            next
-          end
-          if in_escape
-            escape_buf << ch
-            if ch =~ /[a-zA-Z]/
-              in_escape = false
-              out << escape_buf
-              escape_buf.clear
-            end
-            next
-          end
-
-          if ch == " " || ch == "\t" || ch == "\r" || ch == "\n"
-            out << ch
-          else
-            phase = char_count * 0.22 + phase_offset
-            factor = (Math.sin(tick + phase) + 1.0) / 2.0
-            f = 0.35 + 0.65 * factor
-            r = (base[0] * f).clamp(0, 255).to_i
-            g = (base[1] * f).clamp(0, 255).to_i
-            b = (base[2] * f).clamp(0, 255).to_i
-            glow = (factor > 0.85) ? ";1" : ""
-            out << "\e[38;2;#{r};#{g};#{b}#{glow}m#{ch}"
-            char_count += 1
-          end
-        end
-        out << self.class.ansi_reset
-        return out
-      end
+      factor = (Math.sin(tick + phase_offset) + 1.0) / 2.0
+      f = 0.35 + 0.65 * factor
+      r = (base[0] * f).clamp(0, 255).to_i
+      g = (base[1] * f).clamp(0, 255).to_i
+      b = (base[2] * f).clamp(0, 255).to_i
+      glow = (factor > 0.85) ? ";1" : ""
+      return "\e[38;2;#{r};#{g};#{b}#{glow}m#{text}#{self.class.ansi_reset}"
     end
 
     color_code = self.class.ansi_color(color_name, brightness_level)
@@ -3091,7 +3174,8 @@ class GRmenu
     if @banner && !@banner.empty?
       banner_lines, banner_box_w = render_banner_lines(term_cols)
       unless banner_lines.empty?
-        rendered_lines.concat(banner_lines)
+        b_pad = (@center && term_cols > banner_box_w) ? " " * ((term_cols - banner_box_w) / 2) : ""
+        rendered_lines.concat(banner_lines.map { |l| "#{b_pad}#{l}" })
         rendered_lines << ""
         header_lines_count += banner_lines.length + 1
         header_box_width = [header_box_width, banner_box_w].max
@@ -3111,30 +3195,69 @@ class GRmenu
     calculated_width = [size_max, GRmenu.display_width(@title) + 4, grid_suggested_w].max
     calculated_width = ([calculated_width, GRmenu.display_width(active_desc) + 8].max) unless active_desc.empty?
     calculated_width = ([calculated_width, GRmenu.display_width(@query) + 16].max) if @search
+    if @tabs && !@tabs.empty?
+      tabs_min_w = @tabs.map { |t| GRmenu.display_width(t) + 4 }.sum + (@tabs.length - 1) * 3
+      calculated_width = [calculated_width, tabs_min_w + 4].max
+    end
     total_width = [calculated_width, term_cols - 2].min
 
-    reference_width = header_box_width > 0 ? header_box_width : total_width
-    margin_left = (@center && reference_width > total_width) ? " " * ((reference_width - total_width) / 2) : ""
+    sub_1_preview_w = 0
+    sub_2_preview_w = 0
+    if @open_level >= 1 && is_submenu_item?(@functions[@index])
+      s1_acts = get_submenu_actions(@functions[@index])
+      if s1_acts && !s1_acts.empty?
+        s1_names = s1_acts.map { |a| extract_name_from_action(a) }
+        s1_max = s1_names.empty? ? 10 : s1_names.map { |n| GRmenu.display_width(n) }.max
+        s1_title = all_names[@index] || ""
+        sub_1_preview_w = [s1_max + 8, GRmenu.display_width(s1_title) + 6, 20].max
+        sub_1_preview_w = [sub_1_preview_w, 36].min
+
+        if @open_level >= 2 && is_submenu_item?(s1_acts[@sub_index_1])
+          s2_acts = get_submenu_actions(s1_acts[@sub_index_1])
+          if s2_acts && !s2_acts.empty?
+            s2_names = s2_acts.map { |a| extract_name_from_action(a) }
+            s2_max = s2_names.empty? ? 10 : s2_names.map { |n| GRmenu.display_width(n) }.max
+            s2_title = extract_name_from_action(s1_acts[@sub_index_1]) || ""
+            sub_2_preview_w = [s2_max + 8, GRmenu.display_width(s2_title) + 6, 20].max
+            sub_2_preview_w = [sub_2_preview_w, 36].min
+          end
+        end
+      end
+    end
+
+    total_chain_w = total_width
+    total_chain_w += 2 + sub_1_preview_w if sub_1_preview_w > 0
+    total_chain_w += 2 + sub_2_preview_w if sub_2_preview_w > 0
+
+    margin_left = if @center && term_cols > total_chain_w
+                    " " * ((term_cols - total_chain_w) / 2)
+                  elsif @center && term_cols > total_width
+                    " " * ((term_cols - total_width) / 2)
+                  else
+                    ""
+                  end
 
     subtitle_lines_count = 0
     if @subtitle && !@subtitle.empty?
       subtitle_lines = @subtitle.lines.map(&:chomp)
-      div_w = @divider.is_a?(Numeric) ? @divider.to_i : [reference_width, term_cols - 2].min
+      ref_sub_w = header_box_width > 0 ? header_box_width : total_chain_w
+      div_w = @divider.is_a?(Numeric) ? @divider.to_i : [ref_sub_w, term_cols - 2].min
+      sub_pad = (@center && term_cols > div_w) ? " " * ((term_cols - div_w) / 2) : ""
 
       if @divider
-        rendered_lines << colorize("─" * div_w, @style_config.divider, 0.0)
+        rendered_lines << "#{sub_pad}#{colorize("─" * div_w, @style_config.divider, 0.0)}"
         subtitle_lines_count += 1
       end
 
       subtitle_lines.each_with_index do |sub_line, s_i|
         pad_sub = [div_w - GRmenu.display_width(sub_line), 0].max
         formatted_sub = @center ? (" " * (pad_sub / 2) + sub_line + " " * (pad_sub - (pad_sub / 2))) : sub_line
-        rendered_lines << colorize(formatted_sub, @style_config.subtitle, s_i * 0.3)
+        rendered_lines << "#{sub_pad}#{colorize(formatted_sub, @style_config.subtitle, s_i * 0.3)}"
         subtitle_lines_count += 1
       end
 
       if @divider
-        rendered_lines << colorize("─" * div_w, @style_config.divider, 0.6)
+        rendered_lines << "#{sub_pad}#{colorize("─" * div_w, @style_config.divider, 0.6)}"
         subtitle_lines_count += 1
       end
       rendered_lines << ""
@@ -3227,6 +3350,7 @@ class GRmenu
       v_left  = colorize(v_l_raw, border_color_cfg, 0.2)
       v_right = colorize(v_r_raw, border_color_cfg, 0.8)
 
+      main_box_start = rendered_lines.length
       top_border_line = box_border[:tl] + top_fill + box_border[:tr]
       rendered_lines << "#{margin_left}#{colorize(top_border_line, border_color_cfg, 0.0)}"
 
@@ -3449,9 +3573,9 @@ class GRmenu
         if sub_2_lines
           total_3_w = margin_left.length + total_width + 2 + sub_1_w + 2 + sub_2_w
           if total_3_w <= term_cols
-            sub_1_start = [[parent_row_idx - 1, 0].max, [rendered_lines.length - sub_1_lines.length, 0].max].min
+            sub_1_start = main_box_start
             p1_abs_row = sub_1_start + (p_row_1 || 1)
-            sub_2_start = [[p1_abs_row - 1, 0].max, [rendered_lines.length - sub_2_lines.length, 0].max].min
+            sub_2_start = main_box_start
             max_3_lines = [rendered_lines.length, sub_1_start + sub_1_lines.length, sub_2_start + sub_2_lines.length].max
 
             x1_start = margin_left.length + total_width + 2
@@ -3498,7 +3622,7 @@ class GRmenu
             rendered_lines = stitched_lines
           elsif (sub_1_w + 2 + sub_2_w) <= term_cols
             p1_abs_row = (p_row_1 || 1)
-            sub_2_start = [[p1_abs_row - 1, 0].max, [sub_1_lines.length - sub_2_lines.length, 0].max].min
+            sub_2_start = main_box_start
             max_2_lines = [sub_1_lines.length, sub_2_start + sub_2_lines.length].max
 
             x1_start = margin_left.length
@@ -3538,7 +3662,7 @@ class GRmenu
         else
           total_2_w = margin_left.length + total_width + 2 + sub_1_w
           if total_2_w <= term_cols
-            sub_start_line = [[parent_row_idx - 1, 0].max, [rendered_lines.length - sub_1_lines.length, 0].max].min
+            sub_start_line = main_box_start
             max_total_lines = [rendered_lines.length, sub_start_line + sub_1_lines.length].max
 
             x1_start = margin_left.length + total_width + 2
@@ -3620,7 +3744,8 @@ class GRmenu
     end
   end
 
-  def style(css_content)
+  def style(css_content = nil)
+    return @style if css_content.nil?
     parsed = self.class.parse_config_text(css_content)
     m = ((parsed[:sections] && parsed[:sections]["menu"]) || {}).merge(parsed[:global] || {})
     if m["style"]
@@ -3630,38 +3755,40 @@ class GRmenu
     @banner_style = m["banner_style"].to_i if m["banner_style"]
     @animate = m["animate"].to_s if m["animate"]
     @center = (m["center"].to_s != "false") if m.key?("center")
-    if m["border"] || m["border_color"]
+    if (m["border"] || m["border_color"]) && !@style_config.explicitly_set?(:border)
       c, l = self.class.extract_color_and_level(m["border"] || m["border_color"], 1)
-      @style_config.border(c, l)
+      @style_config.border(c, l, from_css: true)
     end
-    if m["options"] || m["options_color"]
+    if (m["options"] || m["options_color"]) && !@style_config.explicitly_set?(:options)
       c, l = self.class.extract_color_and_level(m["options"] || m["options_color"], 1)
-      @style_config.options(c, l)
+      @style_config.options(c, l, from_css: true)
     end
-    if m["focus"] || m["focus_color"]
+    if (m["focus"] || m["focus_color"]) && !@style_config.explicitly_set?(:focus)
       c, l = self.class.extract_color_and_level(m["focus"] || m["focus_color"], 2)
-      @style_config.focus(c, l)
+      @style_config.focus(c, l, from_css: true)
     end
-    if m["title"] || m["title_color"]
+    if (m["title"] || m["title_color"]) && !@style_config.explicitly_set?(:title)
       c, l = self.class.extract_color_and_level(m["title"] || m["title_color"], 2)
-      @style_config.title(c, l)
+      @style_config.title(c, l, from_css: true)
     end
-    if m["banner"] || m["banner_color"]
+    if (m["banner"] || m["banner_color"]) && !@style_config.explicitly_set?(:banner)
       c, l = self.class.extract_color_and_level(m["banner"] || m["banner_color"], 2)
-      @style_config.banner(c, l)
+      @style_config.banner(c, l, from_css: true)
     end
-    if m["subtitle"] || m["subtitle_color"]
+    if (m["subtitle"] || m["subtitle_color"]) && !@style_config.explicitly_set?(:subtitle)
       c, l = self.class.extract_color_and_level(m["subtitle"] || m["subtitle_color"], 1)
-      @style_config.subtitle(c, l)
+      @style_config.subtitle(c, l, from_css: true)
     end
-    if m["divider"] || m["divider_color"]
+    if (m["divider"] || m["divider_color"]) && !@style_config.explicitly_set?(:divider)
       c, l = self.class.extract_color_and_level(m["divider"] || m["divider_color"], 1)
-      @style_config.divider(c, l)
+      @style_config.divider(c, l, from_css: true)
     end
-    if m["desc_prefix"] || m["description_prefix"] || m["prefix"]
-      @style_config.desc_prefix(m["desc_prefix"] || m["description_prefix"] || m["prefix"])
+    if (m["desc_prefix"] || m["description_prefix"] || m["prefix"]) && !@style_config.explicitly_set?(:desc_prefix)
+      @style_config.desc_prefix(m["desc_prefix"] || m["description_prefix"] || m["prefix"], from_css: true)
+    end
+    if m["font"] && !@style_config.explicitly_set?(:font)
+      @style_config.font(m["font"].to_i, from_css: true)
     end
-    @style_config.font(m["font"].to_i) if m["font"]
     @mouse = (m["mouse"].to_s == "true") if m.key?("mouse")
     if parsed[:sections] && parsed[:sections]["tabs"]
       t_sec = parsed[:sections]["tabs"]
@@ -3671,6 +3798,15 @@ class GRmenu
     self
   end
 
+  def style=(val)
+    if val.is_a?(String) && (val.include?("::") || val.include?("<<") || val.include?("@theme"))
+      style(val)
+    else
+      @style = val.to_i
+      @border_config = BORDERS[@style] || BORDERS[3]
+    end
+  end
+
   def export_config(path = nil)
     if path.nil?
       caller_loc = caller_locations.find { |c| !c.path.include?(__FILE__) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grmenu
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - grcode