fix!: remove popup as it is to difficult to manage

Popup was a little made to see if it was possible to have separate highlights for floating windows and for menu like popup items, this proved to be very difficult to manage and outright impossible to deal with very specific situations that add much to complexity as well as straight up not working with out modifying use configurations and that is outside the scope of a theme, maybe if something changes or anything new arises in the future ill give it an other go but for now it will just be removed.
AstroNvim · Oct 11, 2023 · dd49c67 · dd49c67
1 parent 6490250
commit dd49c67
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,6 @@ require("astrotheme").setup({
     transparent = false,         -- Bool value, toggles transparency.
     inactive = true,             -- Bool value, toggles inactive window color.
     float = true,                -- Bool value, toggles floating windows background colors.
-    popup = true,                -- Bool value, toggles popup background color.
     neotree = true,              -- Bool value, toggles neo-trees background color.
     border = true,               -- Bool value, toggles borders.
     title_invert = true,         -- Bool value, swaps text and background colors.
@@ -176,7 +175,6 @@ ui.base
 ui.inactive_base
 ui.statusline
 ui.split
-ui.popup
 ui.float
 ui.title
 ui.border

diff --git a/doc/astrotheme.txt b/doc/astrotheme.txt
@@ -57,7 +57,6 @@ OPTIONS                                                   *astrotheme-options*
         transparent = false,         -- Bool value, toggles transparency.
         inactive = true,             -- Bool value, toggles inactive window color.
         float = true,                -- Bool value, toggles floating windows background colors.
-        popup = true,                -- Bool value, toggles popup background color.
         neotree = true,              -- Bool value, toggles neo-trees background color.
         border = true,               -- Bool value, toggles borders.
         title_invert = true,         -- Bool value, swaps text and background colors.
@@ -159,7 +158,6 @@ modifiable palette names ~
     ui.inactive_base
     ui.statusline
     ui.split
-    ui.popup
     ui.float
     ui.title
     ui.border

diff --git a/extras/wezterm/wezterm_astrodark.lua b/extras/wezterm/wezterm_astrodark.lua
@@ -41,7 +41,6 @@ c.ui.base = "#1A1D23"
 c.ui.inactive_base = "#16181D"
 c.ui.statusline = "#111317"
 c.ui.split = "#111317"
-c.ui.popup = "#16181D"
 c.ui.float = "#16181D"
 c.ui.title = c.ui.accent
 c.ui.border = "#7A7C7E"

diff --git a/lua/astrotheme/groups/base.lua b/lua/astrotheme/groups/base.lua
@@ -48,30 +48,6 @@ local function callback(opts)
       blend = vim.o.winblend or 0,
     },
 
-    --------------------
-    --- Popup
-    --------------------
-    PopupTitle = {
-      fg = (opts.title_invert and C.ui.tool) or C.ui.title,
-      bg = (opts.title_invert and C.ui.title)
-        or (opts.inactive and C.ui.base)
-        or (opts.popup and C.ui.popup)
-        or (opts.transparent and C.none)
-        or C.ui.base,
-      blend = opts.title_invert and 0 or vim.o.winblend or 0,
-      bold = true,
-    },
-    PopupBorder = {
-      fg = (opts.border and C.ui.border) or (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or C.ui.base,
-      bg = (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or (opts.transparent and C.none) or C.ui.base,
-      blend = vim.o.winblend or 0,
-    },
-    NormalPopup = {
-      fg = C.ui.text,
-      bg = (opts.inactive and C.ui.base) or (opts.popup and C.ui.popup) or (opts.transparent and C.none) or C.ui.base,
-      blend = vim.o.winblend or 0,
-    },
-
     --------------------
     --- Text
     --------------------

diff --git a/lua/astrotheme/groups/plugins/which-key.lua b/lua/astrotheme/groups/plugins/which-key.lua
@@ -1,8 +1,8 @@
 local function callback(opts)
   return {
     WhichKey = { fg = C.ui.cyan },
-    WhichKeyFloat = { bg = opts.popup and C.ui.popup or C.ui.base },
-    WhichKeyBorder = { fg = C.none },
+    WhichKeyFloat = { link = "NormalFloat" },
+    WhichKeyBorder = { link = "FloatBorder" },
     WhichKeySeparator = { fg = C.ui.none_text },
     WhichKeyDesc = { fg = C.ui.purple },
     WhichKeyGroup = { fg = C.ui.blue },

diff --git a/lua/astrotheme/lib/config.lua b/lua/astrotheme/lib/config.lua
@@ -9,7 +9,6 @@ M.default = {
     transparent = false,
     inactive = true,
     float = true,
-    popup = true,
     neotree = true,
     border = true,
     title_invert = false,

diff --git a/lua/astrotheme/palettes/astrodark.lua b/lua/astrotheme/palettes/astrodark.lua
@@ -39,8 +39,6 @@ c.ui.base = "#1A1D23"
 c.ui.inactive_base = "#16181D"
 c.ui.statusline = "#111317"
 c.ui.split = "#111317"
-c.ui.popup = "#16181D"
-c.ui.float = "#16181D"
 c.ui.title = c.ui.accent
 c.ui.border = "#3A3E47"
 c.ui.current_line = "#1E222A"

diff --git a/lua/astrotheme/palettes/astrolight.lua b/lua/astrotheme/palettes/astrolight.lua
@@ -39,7 +39,6 @@ c.ui.base = "#FEEEEE"
 c.ui.inactive_base = "#F9DCD1"
 c.ui.statusline = "#D8D6D5"
 c.ui.split = "#D8D6D5"
-c.ui.popup = "#D8D6D5"
 c.ui.float = "#D8D6D5"
 c.ui.title = c.ui.accent
 c.ui.border = c.ui.accent

diff --git a/lua/astrotheme/palettes/astromars.lua b/lua/astrotheme/palettes/astromars.lua
@@ -40,7 +40,6 @@ c.ui.base = "#1E1517"
 c.ui.inactive_base = "#1A1113"
 c.ui.statusline = "#281E22"
 c.ui.split = "#281E22"
-c.ui.popup = "#1A1113"
 c.ui.float = "#1A1113"
 c.ui.title = c.ui.accent
 c.ui.border = "#736468"