mbk-lab
/
rui_orig
mirror of https://github.com/anoshenko/rui.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from anoshenko/feature/fix-theme-styles 

Allow empty style/media-style serialization. Remove media-styles if t…
This commit is contained in:
Alexei Anoshenko 2026-06-29 15:26:16 +03:00 committed by GitHub
parent d88c214d58 3114b810a4
commit 4c3bcf4427
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
theme.go
View File

@ -369,6 +369,15 @@ func (theme *theme) RemoveStyle(tag string) {
for _, mediaStyle := range theme.mediaStyles {
remove(mediaStyle.styles)
}
// Remove empty media styles
newMediaStyles := make([]mediaStyle, 0)
for _, mediaStyle := range theme.mediaStyles {
if len(mediaStyle.styles) > 0 {
newMediaStyles = append(newMediaStyles, mediaStyle)
}
}
theme.mediaStyles = newMediaStyles
}
func (theme *theme) MediaStyle(tag string, params MediaStyleParams) ViewStyle {
@ -420,14 +429,24 @@ func (theme *theme) SetMediaStyle(tag string, params MediaStyleParams, style Vie
styles.MinHeight == params.MinHeight {
if style != nil {
theme.mediaStyles[i].styles[tag] = style
return
} else {
delete(theme.mediaStyles[i].styles, tag)
// Remove empty media styles
newMediaStyles := make([]mediaStyle, 0)
for _, mediaStyle := range theme.mediaStyles {
if len(mediaStyle.styles) > 0 {
newMediaStyles = append(newMediaStyles, mediaStyle)
}
}
theme.mediaStyles = newMediaStyles
return
}
break
}
}
if style != nil {
// New media style, append and sort media styles
theme.mediaStyles = append(theme.mediaStyles, mediaStyle{
MediaStyleParams: params,
styles: map[string]ViewStyle{tag: style},
@ -977,7 +996,7 @@ func (theme *theme) String() string {
buffer.WriteString(" = [\n")
for _, tag := range tags {
if style, ok := styles[tag]; ok && !style.IsEmpty() {
if style, ok := styles[tag]; ok {
buffer.WriteString("\t\t")
writeViewStyle(tag, style, buffer, "\t\t", nil)
buffer.WriteString(",\n")
@ -1028,7 +1047,7 @@ func (theme *theme) String() string {
buffer.WriteString(" = [\n")
for _, tag := range tags {
if style, ok := media.styles[tag]; ok && !style.IsEmpty() {
if style, ok := media.styles[tag]; ok {
buffer.WriteString("\t\t")
writeViewStyle(tag, style, buffer, "\t\t", nil)
buffer.WriteString(",\n")