feat(grub-theme): 优化并新增Deepin grub主题支持

- 新增 adjustThemeNormalV25 处理函数，替代旧版本普通主题调整逻辑
- 重构调整启动菜单逻辑，简化 adjustBootMenu 函数，支持不同分辨率下的配置
- 在 Theme 结构体中添加 FindComponentByType 方法，便于根据类型查找组件
- 引入并使用 deepin-v20 主题数据，重命名相关资源文件路径
- 更新 deepin 主题的 theme.txt.tpl 模板，提高启动菜单和标签文字的配置灵活性
- 调整主题背景图片处理逻辑，支持保存背景及主题内背景图
- 测试代码中调用调整普通主题的函数改为新版本接口调用
- 优化字体和界面元素的样式及位置，提升视觉效果和一致性

Bug: PMS-277733

Author: electricface

adjust-grub-theme/adjust_grub_theme_test.go

@@ -201,7 +201,7 @@ func (s *su) TestAdjustThemeNormal() {
 	defer func() {
 		_ = os.RemoveAll(optThemeOutputDir)
 	}()
-	err = adjustThemeNormal()
+	err = adjustThemeNormalV20()
 	assert.Equal(s.T(), nil, err)
 
 }

adjust-grub-theme/main.go

@@ -306,13 +306,13 @@ func adjustTheme() {
 	if optFallbackOnly {
 		return
 	}
-	err = adjustThemeNormal()
+	err = adjustThemeNormalV25()
 	if err != nil {
 		logger.Fatal(err)
 	}
 }
 
-func adjustThemeNormal() error {
+func adjustThemeNormalV20() error {
 	themeInputDir := filepath.Join(optThemeInputDir, themeNameNormal)
 	themeOutputDir := filepath.Join(optThemeOutputDir, themeNameNormal)
 
@@ -342,8 +342,6 @@ func adjustThemeNormal() error {
 
 	for _, comp := range theme.Components {
 		if comp.Type == tt.ComponentTypeBootMenu {
-			adjustBootMenu(themeOutputDir, comp, vars)
-
 			iconWidth, _ := comp.GetPropInt("icon_width")
 			iconHeight, _ := comp.GetPropInt("icon_height")
 			err = adjustResourcesOsLogos(themeInputDir, themeOutputDir, iconWidth, iconHeight)
@@ -409,6 +407,100 @@ func adjustThemeNormal() error {
 	return err
 }
 
+func adjustThemeNormalV25() error {
+	themeInputDir := filepath.Join(optThemeInputDir, themeNameNormal)
+	themeOutputDir := filepath.Join(optThemeOutputDir, themeNameNormal)
+
+	cleanupThemeOutputDir(themeOutputDir)
+	err := os.MkdirAll(themeOutputDir, 0755)
+	if err != nil {
+		return err
+	}
+	copyThemeFiles(themeInputDir, themeOutputDir)
+
+	bgImg, themeBgImg, err := loadV25BackgroundImage()
+	if err != nil {
+		return err
+	}
+
+	err = saveJpeg(bgImg, filepath.Join(themeOutputDir, "background.jpg"))
+	if err != nil {
+		return err
+	}
+	if themeBgImg != nil {
+		err = saveJpeg(themeBgImg, filepath.Join(themeOutputDir, "background_in_theme.jpg"))
+		if err != nil {
+			return err
+		}
+	} else {
+		_, err = copyFile(filepath.Join(themeOutputDir, "background.jpg"),
+			filepath.Join(themeOutputDir, "background_in_theme.jpg"))
+		if err != nil {
+			return err
+		}
+	}
+
+	themeFile := filepath.Join(themeInputDir, "theme.txt.tpl")
+	theme, err := tt.ParseThemeFile(themeFile)
+	if err != nil {
+		return err
+	}
+
+	bootMenu := theme.FindComponentByType(tt.ComponentTypeBootMenu)
+	if bootMenu != nil {
+		adjustBootMenu(bootMenu, optScreenWidth, optScreenHeight)
+	}
+
+	for _, comp := range theme.Components {
+		if comp.Type == tt.ComponentTypeLabel {
+			adjustLabelText(comp)
+		}
+	}
+
+	themeOutput := filepath.Join(themeOutputDir, "theme.txt")
+	themeOutputFh, err := os.Create(themeOutput)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = themeOutputFh.Close()
+	}()
+	bw := bufio.NewWriter(themeOutputFh)
+	// write head
+	_, err = fmt.Fprintf(bw, "#version:%d\n", VERSION)
+	if err != nil {
+		return err
+	}
+	_, err = fmt.Fprintf(bw, "#lang:%s\n", optLang)
+	if err != nil {
+		return err
+	}
+
+	var inputDir string
+	inputDir, err = filepath.Abs(themeInputDir)
+	if err != nil {
+		logger.Warning(err)
+		inputDir = themeInputDir
+	}
+
+	_, err = fmt.Fprintf(bw, "#themeInputDir:%s\n", inputDir)
+	if err != nil {
+		return err
+	}
+
+	_, err = fmt.Fprintln(bw, "#head end")
+	if err != nil {
+		return err
+	}
+
+	_, err = theme.WriteTo(bw)
+	if err != nil {
+		return err
+	}
+	err = bw.Flush()
+	return err
+}
+
 func adjustThemeFallback() error {
 	themeInputDir := filepath.Join(optThemeInputDir, themeNameFallback)
 	themeOutputDir := filepath.Join(optThemeOutputDir, themeNameFallback)
@@ -936,52 +1028,13 @@ func adjustBootMenuPixmapStyle(themeOutputDir string, comp *tt.Component, bgImg
 	cropSaveStyleBox(img3, prefix, x+menuR)
 }
 
-func adjustBootMenu(themeOutputDir string, comp *tt.Component, vars map[string]float64) {
-	vars = copyVars(vars)
-	face, err := adjustFont(themeOutputDir, comp, "item_font", vars)
-	if err != nil {
-		logger.Fatal(err)
-	}
-
-	fontHeight := face.Height()
-	vars["font_height"] = float64(fontHeight)
-
-	itemHeight := adjustProp(comp, "item_height", vars)
-	itemR := getItemR(itemHeight)
-	vars["item_r"] = float64(itemR)
-	menuR := getBootMenuR(itemHeight)
-	vars["menu_r"] = float64(menuR)
-
-	for _, propName := range []string{
-		"item_spacing",
-		"item_padding", "icon_width",
-		"icon_height", "item_icon_space",
-		"height", "width",
-		"left", "top",
-	} {
-		adjustProp(comp, propName, vars)
-	}
-
-	scrollbarThumbR := getScrollbarThumbR(menuR)
-	comp.SetProp("scrollbar_width", scrollbarThumbR*2)
-
-	bgImg, err := loadBackgroundImage()
-	if err != nil {
-		logger.Fatal(err)
-	}
-
-	bgImg, err = adjustBackground(themeOutputDir, bgImg)
-	if err != nil {
-		logger.Fatal(err)
+func adjustBootMenu(comp *tt.Component, width, height int) {
+	// bootMenuBasePercent 是 boot menu 宽度计算的基础百分比
+	if width == 1024 && height == 768 {
+		const bootMenuBasePercent = 18
+		comp.SetProp("width", tt.RelNum(bootMenuBasePercent*2))
+		comp.SetProp("left", tt.RelNum(50-bootMenuBasePercent))
 	}
-	adjustBootMenuPixmapStyle(themeOutputDir, comp, bgImg)
-
-	convertPropAbs2Rel(comp, "left", orientationHorizontal)
-	convertPropAbs2Rel(comp, "top", orientationVertical)
-
-	adjustSelectedItemPixmapStyle(itemR)
-	adjustItemPixmapStyle(itemR)
-	adjustScrollbarThumbPixmapStyle(scrollbarThumbR)
 }
 
 const (

grub_theme/themetxt/theme.go

@@ -264,6 +264,16 @@ func (t *Theme) Dump() {
 	}
 }
 
+// FindComponentByType finds the first component by component type
+func (t *Theme) FindComponentByType(compType string) *Component {
+	for _, comp := range t.Components {
+		if comp.Type == compType {
+			return comp
+		}
+	}
+	return nil
+}
+
 func (t *Theme) WriteTo(w io.Writer) (n int64, err error) {
 	for _, prop := range t.Props {
 		var pn int