mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 16:58:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "themes kitten: When using the Default theme as an auto switch theme include all the actual settings values"

Browse Source 
This reverts commit 2abc0be844.
This commit is contained in:
Kovid Goyal
2024-12-20 12:54:47 +05:30
parent dd9d8353df
commit 35b3ae8edb
5 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/themes/collection.go
View File

@@ -22,10 +22,8 @@ import (
"sync"
"time"
"kitty"
"kitty/tools/cli"
"kitty/tools/config"
"kitty/tools/tty"
"kitty/tools/tui/loop"
"kitty/tools/tui/subseq"
"kitty/tools/utils"
@@ -543,7 +541,6 @@ type Theme struct {
zip_reader *zip.File
is_user_defined bool
path_for_user_defined_theme string
generate_default_settings bool
}
func (self *Theme) Name() string { return self.metadata.Name }
@@ -552,14 +549,6 @@ func (self *Theme) Blurb() string { return self.metadata.Blurb }
func (self *Theme) IsDark() bool { return self.metadata.Is_dark }
func (self *Theme) IsUserDefined() bool { return self.is_user_defined }
func (self *Theme) GenerateDefaultSettings() func() {
orig := self.generate_default_settings
self.generate_default_settings = true
return func() {
self.generate_default_settings = orig
}
}
func (self *Theme) load_code() (string, error) {
if self.zip_reader != nil {
f, err := self.zip_reader.Open()
@@ -597,8 +586,6 @@ func (self *Theme) SaveInDir(dirpath string) (err error) {
return utils.AtomicUpdateFile(path, bytes.NewReader(utils.UnsafeStringToBytes(code)), 0o644)
}
var debugprintln = tty.DebugPrintln
func (self *Theme) SaveInFile(config_dir, config_file_name string) (err error) {
_ = os.MkdirAll(config_dir, 0o755)
path := filepath.Join(config_dir, config_file_name)
@@ -606,10 +593,6 @@ func (self *Theme) SaveInFile(config_dir, config_file_name string) (err error) {
if err != nil {
return err
}
if self.generate_default_settings && self.Name() == "Default" {
code += "\n" + kitty.DefaultColorTheme
}
return utils.AtomicUpdateFile(path, bytes.NewReader(utils.UnsafeStringToBytes(code)), 0o644)
}