Skip to content

Commit 2d465e3

Browse files
committed
fix: remove firefox dpi settings
Firefox HiDPI has already adapted to GDK and Xft.dpi, so there is no need to set devPixelsPerPx anymore.
1 parent 8b9b6cb commit 2d465e3

File tree

2 files changed

+0
-82
lines changed

2 files changed

+0
-82
lines changed

xsettings/xsettings.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ func Start(conn *x.Conn, recommendedScaleFactor float64, service *dbusutil.Servi
352352
}
353353
m.updateDPI()
354354
m.updateXResources()
355-
go m.updateFirefoxDPI()
356355

357356
err = service.Export(xsDBusPath, m)
358357
if err != nil {

xsettings/xsettings_dpi.go

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ package xsettings
66

77
import (
88
"fmt"
9-
"os"
10-
"path"
119
"strconv"
12-
"strings"
13-
14-
"github.com/linuxdeepin/go-lib/utils"
1510
)
1611

1712
const (
@@ -89,79 +84,3 @@ func (m *XSManager) updateXResources() {
8984
},
9085
})
9186
}
92-
93-
var ffDir = path.Join(os.Getenv("HOME"), ".mozilla/firefox")
94-
95-
func (m *XSManager) updateFirefoxDPI() {
96-
scale := m.cfgHelper.GetDouble(gsKeyScaleFactor)
97-
if scale <= 0 {
98-
// firefox default value: -1
99-
scale = -1
100-
}
101-
102-
configs, err := getFirefoxConfigs(ffDir)
103-
if err != nil {
104-
logger.Debug("Failed to get firefox configs:", err)
105-
return
106-
}
107-
108-
for _, config := range configs {
109-
err = setFirefoxDPI(scale, config, config)
110-
if err != nil {
111-
logger.Warning("Failed to set firefox dpi:", config, err)
112-
}
113-
}
114-
}
115-
116-
func getFirefoxConfigs(dir string) ([]string, error) {
117-
finfos, err := os.ReadDir(dir)
118-
if err != nil {
119-
return nil, err
120-
}
121-
var configs []string
122-
for _, finfo := range finfos {
123-
config := path.Join(dir, finfo.Name(), "prefs.js")
124-
if !utils.IsFileExist(config) {
125-
continue
126-
}
127-
configs = append(configs, config)
128-
}
129-
return configs, nil
130-
}
131-
132-
func setFirefoxDPI(value float64, src, dest string) error {
133-
contents, err := os.ReadFile(src)
134-
if err != nil {
135-
return err
136-
}
137-
lines := strings.Split(string(contents), "\n")
138-
target := fmt.Sprintf("%s \"%.2f\");", ffKeyPixels, value)
139-
found := false
140-
for i, line := range lines {
141-
if line == "" || line[0] == '#' {
142-
continue
143-
}
144-
if !strings.Contains(line, ffKeyPixels) {
145-
continue
146-
}
147-
148-
if line == target {
149-
return nil
150-
}
151-
152-
tmp := strings.Split(ffKeyPixels, ",")[0] + ", " +
153-
fmt.Sprintf("\"%.2f\");", value)
154-
lines[i] = tmp
155-
found = true
156-
break
157-
}
158-
if !found {
159-
if value == -1 {
160-
return nil
161-
}
162-
tmp := lines[len(lines)-1]
163-
lines[len(lines)-1] = target
164-
lines = append(lines, tmp)
165-
}
166-
return os.WriteFile(dest, []byte(strings.Join(lines, "\n")), 0644)
167-
}

0 commit comments

Comments
 (0)